Merge branch 'bzq1/excel_rule_master' of eta_server/eta_api into debug

controllers/data_manage/excel/excel_info.go

@@ -2013,7 +2013,11 @@ func (c *ExcelInfoController) GetBatchEdbData() {
 		if len(firstDataList) == 0 {
 			firstDataList = req.DateList
 		}
-		req.Num = len(firstDataList)
+		if len(firstDataList) != 0 && len(firstDataList) != req.Num {
+			req.Num = len(firstDataList)
+		} else {
+			req.Num = 12
+		}
 		if i == 0 {
 			dataList, err := excel2.GetFirstEdbDataList(edbInfo, req.Num, firstDataList)
 			if err != nil {