Merge remote-tracking branch 'origin/master'

linwe

2023-12-21 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -131,6 +131,17 @@
      return R.data(UserWrapper.build().pageVO(pages));
   }


   /**
    * 按条件查询用户信息
    * @param user
    * @return
    */
   @GetMapping("/getUserListByParam")
   public R getUserListByParam(UserVO user) {
      return R.data(userService.getUserListByParam(user));
   }

   /**
    * 新增或修改
    */