Merge branch 'crm/crm_16.6' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/roadshow/report.go

@@ -156,7 +156,7 @@ func GetQuarterData(adminType, dimensionType string) (adminDataMapList []AdminDa
 	go getSectionData(lastQuarterFirstDay1, lastQuarterLastDay1, adminType, dimensionType, ch2)
 	go getSectionData(lastQuarterFirstDay2, lastQuarterLastDay2, adminType, dimensionType, ch3)
 
-	var nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2, lastMonthAdminDataMap3 AdminDataMap
+	var nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2 AdminDataMap
 
 	nowMonthAdminDataMap = <-ch1
 	close(ch1)
@@ -168,7 +168,7 @@ func GetQuarterData(adminType, dimensionType string) (adminDataMapList []AdminDa
 	close(ch3)
 
 	adminDataMapList = make([]AdminDataMap, 0)
-	adminDataMapList = append(adminDataMapList, nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2, lastMonthAdminDataMap3)
+	adminDataMapList = append(adminDataMapList, nowMonthAdminDataMap, lastMonthAdminDataMap1, lastMonthAdminDataMap2)
 	return
 }