From b10c4ade79a1cd3520b6d3b24e3eae236a156bca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 14:56:06 +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 |    9 ++++++++-
 1 files changed, 8 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..19f6d21 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;
 
 /**
  * 鏈嶅姟绫�
@@ -91,6 +92,12 @@
 	List<User> selectAllUser(User user, Long deptId);
 
 	/**
+	 * 鑾峰彇鎵�鏈�
+	 * @return
+	 */
+	List<User>  selectAllUser();
+
+	/**
 	 * 鑷畾涔夊垎椤�
 	 *
 	 * @param user
@@ -251,6 +258,6 @@
 	 * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤
 	 * @return
 	 */
-	List<UserVO> getByRoleUserList(BladeUser user, String roleName);
+	List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName);
 
 }

--
Gitblit v1.10.0