Merge remote-tracking branch 'origin/master' into debug

models/base_from_calculate.go

@@ -146,10 +146,10 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 			condition += " AND data_time>=? "
 			pars = append(pars, startDate)
 		}
-		if endDate != "" {
-			condition += " AND data_time<=? "
-			pars = append(pars, endDate)
-		}
+		//if endDate != "" {
+		//	condition += " AND data_time<=? "
+		//	pars = append(pars, endDate)
+		//}
 		fmt.Println("v.Source:", v.Source)
 		dataList, err := GetEdbDataListAll(condition, pars, v.Source, 1)
 		if err != nil {