Merge remote-tracking branch 'origin/master' into debug

models/data_manage/multiple_graph_config_chart_mapping.go

@@ -166,7 +166,7 @@ func ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo *EdbInfo, userId
 		tmpChartInfoCorrelationList := make([]*ChartInfoCorrelation, 0)
 		tmpSql := `SELECT a.* FROM chart_info_correlation AS a 
          JOIN chart_info AS b on a.correlation_chart_info_id = b.chart_info_id
-         WHERE b.sys_user_id = ? AND (edb_info_id_a=? or edb_info_id_b=?) `
+         WHERE b.sys_user_id = ? AND (edb_info_id_first=? or edb_info_id_second=?) `
 		err = to.Raw(tmpSql, userId, oldEdbInfo.EdbInfoId, oldEdbInfo.EdbInfoId).Find(&tmpChartInfoCorrelationList).Error
 		if err != nil {
 			errmsg = "获取指标关联图表配置信息失败：Err:" + err.Error()