Merge branch 'xjjdev' into dev

cmd/internal/dao/artistInfo_user.go

@@ -35,7 +35,7 @@ func RegisterUser(req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.
 	zap.L().Debug(fmt.Sprintf("RegisterUser--user: %+v", user))
 	if err = db.DB.Create(&user).Error; err != nil {
 		zap.L().Error("register user err", zap.Error(err))
-		err = errors.New(m.ERROR_SELECT)
+		err = errors.New(m.CREATE_ERROR)
 		return nil, err
 	}
 	return
@@ -816,6 +816,9 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 	if req.WxAccount != "" {
 		preUpdateData.WxAccount = req.WxAccount
 	}
+	if req.MgmtArtistId != 0 {
+		preUpdateData.MgmtArtistId = req.MgmtArtistId
+	}
 
 	tx := db.DB.Begin()
 	err = tx.Save(&preUpdateData).Error