Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

 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);

   /**
    * 自定义分页
@@ -254,6 +254,10 @@
    */
   Object handleUserDept();

   List<User> getUserListByIds(String receiveUser);

   List<User> getUserListByDeptIds(String receiveDept);

   List<User> getUserInfoByPropertyId(String propertyCompanyId,String roleId);

   Object handleUser();