fix：一键更新图表的时候，不允许发布

controllers/data_manage/chart_info.go

@@ -1801,8 +1801,6 @@ func (this *ChartInfoController) ChartInfoImageSet() {
 	br.Success = true
 	br.Msg = "保存成功"
 }
-<<<<<<< HEAD
-=======
 
 // GetBatchChartRefreshResult
 // @Title 获取批量刷新图表结果的接口
@@ -1843,4 +1841,3 @@ func (this *EdbInfoController) GetBatchChartRefreshResult() {
 	br.Success = true
 
 }
->>>>>>> pool/all_chart_refresh