Merge remote-tracking branch 'origin/master'

linwei

2024-02-21 86498f43cb9e6a5f8c58cca7b5c07a5ad1e23b2f

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -73,7 +73,7 @@
    * @param tenantId
    * @return
    */
   IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
   IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId);

   /**
    * 自定义分页