Merge branch 'crm/need_1021' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

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"  `
 		}