Merge remote-tracking branch 'origin/master'

linwei

2024-02-22 9269fc94626bd9ed8c6c3d9e021d37b22d86a665

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

   /**
    * 自定义分页
@@ -267,4 +267,6 @@
    * @param data
    */
   void importPoliceUser(List<PoliceUserExcel> data);

   List<UserEntity> getUserInfoByDistrictIds(String districtIds);
}