Merge branch 'chart/14.8' into debug

logic/predict_edb.go

@@ -32,11 +32,11 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName string, ruleList
 			err = errors.New(errMsg)
 			return
 		}
-		if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
-			errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
-			err = errors.New(errMsg)
-			return
-		}
+		//if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
+		//	errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
+		//	err = errors.New(errMsg)
+		//	return
+		//}
 	}
 
 	var classifyInfo *models.EdbClassify
@@ -476,11 +476,11 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName string, ruleList []mo
 			err = errors.New(errMsg)
 			return
 		}
-		if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
-			errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
-			err = errors.New(errMsg)
-			return
-		}
+		//if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
+		//	errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
+		//	err = errors.New(errMsg)
+		//	return
+		//}
 	}
 
 	// 预测指标配置