From c5a0d277347f9ecaaf934b648b6edf5b9119516b Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Mon, 11 Mar 2024 11:20:06 +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