Merge branch 'chart/13.4' into debug

models/predict_edb.go

@@ -259,7 +259,7 @@ func CalculateByRuleByRuleLineNh(to orm.TxOrmer, predictEdbInfo EdbInfo, predict
 		// 来源指标
 		var sourceEdbInfoItem *EdbInfo
 		sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
-		err = to.Raw(sql, ruleConf.EdbInfoId).QueryRow(&sourceEdbInfoItem)
+		err = to.Raw(sql, rule.SourceEdbInfoId).QueryRow(&sourceEdbInfoItem)
 		if err != nil {
 			return
 		}