Merge branch 'feature/eta1.9.7_interval_analysis' into debug

controllers/data_manage/range_analysis/chart_info.go

@@ -1636,6 +1636,7 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigEdbList() {
 			tmp.EdbName = info.EdbName
 			tmp.ClassifyId = info.ClassifyId
 			tmp.FromEdbInfoId = v.FromEdbInfoId
+			tmp.EdbTypeInfo = info.EdbInfoCategoryType
 			list = append(list, tmp)
 		}
 	}

models/data_manage/chart_info_range_analysis.go

@@ -300,4 +300,5 @@ type ChartRangeAnalysisConfigEdbItem struct {
 	UnitEn        string `description:"单位"`
 	ClassifyId    int    `description:"分类id"`
 	FromEdbInfoId int    `description:"计算来源指标id"`
+	EdbTypeInfo   int    `description:"指标类型，0普通指标，1预测指标"`
 }