Merge remote-tracking branch 'origin/master'

lin

2024-02-29 97ad7e7702c7dbcef19d8fc05b23b7357670c6d7

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

@@ -268,5 +268,5 @@
    */
   void importPoliceUser(List<PoliceUserExcel> data);

   List<UserEntity> getUserInfoByDistrictIds(String districtIds);
   List<User> getUserInfoByDistrictIds(String districtIds);
}