Merge branch 'crm/crm_14.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -395,8 +395,8 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 
 			var ascribecompanyIds []int
 			for _, item := range tmpList {
-				endDateTime, _ := time.Parse(utils.FormatDateTime, item.CreateTime)
-				item.EndDate = endDateTime.Format(utils.FormatDate)
+				//endDateTime, _ := time.Parse(utils.FormatDateTime, item.CreateTime)
+				//item.EndDate = endDateTime.Format(utils.FormatDate)
 				ascribecompanyIds = append(ascribecompanyIds, item.CompanyId)
 			}
 			//归因标签