Merge remote-tracking branch 'origin/master'

xiejun

2023-08-24 4c32b9bf0ccba92eaa34ac5a376a5d3ceddb7484

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java

@@ -369,8 +369,8 @@
    */
   @GetMapping("/getByRoleUserList")
   @ApiOperationSupport(order = 21)
   @ApiOperation(value = "获取到指定身份权限的用户列表", notes = "传入id")
   public R<List<UserVO>> getByRoleUserList(BladeUser user,@Valid @RequestParam String roleName){
   @ApiOperation(value = "获取到指定身份权限的用户列表", notes = "传入roleName")
   public R<List<Map<String,String>>> getByRoleUserList(BladeUser user,@Valid @RequestParam String roleName){
      return R.data(userService.getByRoleUserList(user,roleName));
   }