Merge branch 'feature/eta1.5.7_edb_replace' into debug

models/data_manage/edb_info.go

@@ -902,7 +902,7 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
 						var lineChartInfoConfig request.LineChartInfoReq
 						err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &lineChartInfoConfig)
 						if err != nil {
-							errmsg = "获取图表配置信息失败 json.Unmarshal：Err:" + e.Error()
+							errmsg = "获取图表配置信息失败 json.Unmarshal：Err:" + err.Error()
 							return
 						}
 						xEdbInfoIdList := lineChartInfoConfig.XEdbInfoIdList
@@ -942,7 +942,7 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
 						var tmpExtraConfig SectionScatterReq
 						err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &tmpExtraConfig)
 						if err != nil {
-							errmsg = "获取截面散点图配置信息失败 json.Unmarshal：Err:" + e.Error()
+							errmsg = "获取截面散点图配置信息失败 json.Unmarshal：Err:" + err.Error()
 							return
 						}
 						//找到指标信息，并替换