Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

logic/predict_edb.go

@@ -438,6 +438,12 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 				ModifyTime: time.Now(),
 			}
 			calculateMappingList = append(calculateMappingList, calculateMappingItem)
+			calculateRuleMap[ruleIndex] = models.CalculateRule{
+				EdbInfoList:  edbInfoList,
+				RuleType:     v.RuleType,
+				EndDate:      v.EndDate,
+				EdbInfoIdArr: v.EdbInfoIdArr,
+			}
 		}
 
 		tmpPredictEdbConf := &models.PredictEdbConf{