Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

controllers/data_manage/predict_edb_info.go

@@ -934,7 +934,7 @@ func (this *PredictEdbInfoController) Detail() {
 		}
 		for _, v := range tmpPredictEdbConfList {
 			var tmpPredictEdbConfCalculateMappingDetail []*data_manage.PredictEdbConfCalculateMappingDetail
-			if v.RuleType == 9 || v.RuleType == 14 {
+			if v.RuleType == 9 || v.RuleType == 14 || v.RuleType == 17 || v.RuleType == 18 {
 				tmpPredictEdbConfCalculateMappingDetail, err = data_manage.GetPredictEdbConfCalculateMappingDetailListByConfigId(v.PredictEdbInfoId, v.ConfigId)
 				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"