Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

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

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

   List<User> getUserInfoByDistrictIds(String districtIds);
}