Merge remote-tracking branch 'origin/master'

wangting

2023-07-12 a3d588a997397578a4a241f694156ead3eb15bb9

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

@@ -316,7 +316,6 @@
      return R.data(userService.platformDetail(user));
   }


   /**
    * 用户列表查询
    */
@@ -361,4 +360,6 @@
      return R.data(res);
   }



}