Преглед изворни кода

Merge branch 'CRM_15.6' into debug

zwxi пре 11 месеци
родитељ
комит
5acff9c8a1
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      controllers/roadshow/report.go

+ 2 - 2
controllers/roadshow/report.go

@@ -1430,7 +1430,7 @@ func (this *CalendarController) OverseasSellerReportList() {
 			AdminId:               researcher.AdminId,
 			RsReportRecordNumList: tmpAdminRsReportRecordNumList,
 		}
-		RsReportRecordResp.List = append(adminReportRecordList, tmpAdminReportRecord)
+		RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
 	}
 
 	//总体汇总数据
@@ -1582,7 +1582,7 @@ func (this *CalendarController) OverseasResearcherReportList() {
 			AdminId:               researcher.AdminId,
 			RsReportRecordNumList: tmpAdminRsReportRecordNumList,
 		}
-		RsReportRecordResp.List = append(adminReportRecordList, tmpAdminReportRecord)
+		RsReportRecordResp.List = append(RsReportRecordResp.List, tmpAdminReportRecord)
 	}
 
 	//总体汇总数据