From 92a3b953f2da493e68afb9ae73a15b6513a6c18a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 17:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 0755752..48fc873 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/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);
 }

--
Gitblit v1.9.3