From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期四, 27 七月 2023 16:02:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java index 3b9df69..8291c99 100644 --- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java +++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java @@ -7,13 +7,9 @@ import com.yuanchu.limslaboratory.vo.NewPersonnelVo; import com.yuanchu.limslaboratory.vo.PagePersonnelVo; import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo; -import org.springframework.transaction.annotation.Transactional; - -import java.io.Serializable; import java.util.List; import java.util.Map; -import java.util.Objects; /** * <p> @@ -80,4 +76,9 @@ * @return */ List<User> selectUser(); + + /** + * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d + */ + List<Map<String, Object>> getUserNameAndId(); } -- Gitblit v1.9.3