zhangchuanxing 3 mēneši atpakaļ
vecāks
revīzija
0dc7207a64
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1 1
      controllers/statistic_company_merge.go

+ 1 - 1
controllers/statistic_company_merge.go

@@ -220,7 +220,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		if operation == "新建" {
 			operationSql = ` "add" `
 		} else if operation == "领取" {
-			operationSql = ` "add","receive"  `
+			operationSql = ` "receive","apply_receive"  `
 		} else {
 			operationSql = ` "add","receive","apply_receive"  `
 		}