Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

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

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

   /**
    * 查询500M内的民警
    * @param longitude
    * @param latitude
    * @return
    */
   List<User> getPoliceUser(String longitude, String latitude, String houseCode);
}