Merge remote-tracking branch 'origin/master'

yuxc

2023-08-11 baa6f4e889d0bd654f4b0c21a6dd28c150b54a73

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java

@@ -65,6 +65,11 @@
   public R<UserInfo> userInfo(String tenantId, String account, String userType) {
      return R.data(service.userInfo(tenantId, account, UserEnum.of(userType)));
   }
   @Override
   @GetMapping(USER_ALL)
   public R<List<User>> selectAllUser() {
      return R.data(service.selectAllUser());
   }

   @Override
   @PostMapping(USER_AUTH_INFO)