From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 17 七月 2023 10:14:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java index fd13d1e..b8390e1 100644 --- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java +++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java @@ -30,6 +30,7 @@ import org.springblade.core.secure.BladeUser; import java.util.List; +import java.util.Map; /** * 鏈嶅姟绫� @@ -251,6 +252,6 @@ * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤 * @return */ - List<UserVO> getByRoleUserList(BladeUser user, String roleName); + List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName); } -- Gitblit v1.9.3