Merge branch 'CRM_15.6'

models/roadshow/report_record.go

@@ -334,7 +334,7 @@ func GetOverseasGroupResearcherRecordList(startDate, endDate, companyStatus stri
 	//sql2 += ` GROUP BY admin_id `
 
 	// 列表数据
-	sql := `SELECT m.*,count(1) as sum  FROM (` + sql1 + ` UNION ALL ` + sql2
+	sql := `SELECT m.*,count(1) as num  FROM (` + sql1 + ` UNION ALL ` + sql2
 	sql += ` ) AS m  WHERE 1=1 `
 
 	sql += ` Group by admin_id `