Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author: zj @Date: 2023/5/17 21:17
@@ -55,7 +54,7 @@ public class CooperationController extends BaseController {
     return cooperationService.apply(userApplyTagVO);
   }
 
-  @ApiOperation(value = "后台申请列表")
+  @ApiOperation(value = "后台-申请列表")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserApplyTagVO.class)})
   @PostMapping("listUserApplyTag")
   public ResultBody<UserApplyTagVO> listUserApplyTag(@RequestBody ApplyQO applyQO) {
@@ -86,12 +85,13 @@ public class CooperationController extends BaseController {
     return ResultBody.success(cooperationService.approvalApplyTag(id, status));
   }
 
-    @ApiOperation(value = "后台设置小程序用户标签")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
-    @PostMapping("changeUserTag")
-    public ResultBody changeUserTag(@Validated(Update.class) @RequestBody UserCooperationTagVO userCooperationTagVO) {
-        return cooperationService.changeUserTag(userCooperationTagVO);
-    }
+  @ApiOperation(value = "后台设置小程序用户标签")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+  @PostMapping("changeUserTag")
+  public ResultBody changeUserTag(
+      @Validated(Update.class) @RequestBody UserCooperationTagVO userCooperationTagVO) {
+    return cooperationService.changeUserTag(userCooperationTagVO);
+  }
 
   @ApiOperation(value = "获取合作渠道标签", hidden = true)
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CooperationTagVO.class)})

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 9b52210b702668e71172adf089dc2bb498d37438
+  newTag: f82bfbd7ba3f82e57e43574044b424e2f3e379df