Merge branch 'bug/5269'

# Conflicts:
#	controllers/data_manage/data_manage_permission/data_move.go

controllers/data_manage/data_manage_permission/data_move.go

@@ -271,7 +271,7 @@ func (c *DataMangePermissionController) MoveEdbChartUser() {
 		return
 	}
 
-	err, errMsg := data_manage_permission.MoveEdbChart(req.Source, req.SubSource, req.UserId, req.NewUserId, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.ClassifyId, sysUser.AdminId, sysUser.RealName)
+	err, errMsg := data_manage_permission.MoveEdbChart(req.Source, req.SubSource, req.UserId, req.NewUserId, req.IsSelectAll, req.DataIdList, req.NoDataIdList, req.Keyword, req.Classify, sysUser.AdminId, sysUser.RealName)
 	if err != nil {
 		//br.Success = true
 		br.Msg = "移动失败"

models/data_manage/data_manage_permission/req_and_resp.go

@@ -10,7 +10,7 @@ type MoveEdbChartReq struct {
 	NoDataIdList []string `description:"指标/图表唯一id列表"`
 	NewUserId    int      `description:"新的创建人id"`
 	IsSelectAll  bool     `description:"是否选择所有指标"`
-	ClassifyId   string   `description:"分类id，支持多选，用英文,隔开"`
+	Classify     string   `description:"分类id，支持多选，用英文,隔开"`
 	Keyword      string   `description:"关键字"`
 	UserId       int      `description:"旧的创建人id"`
 }