From d8a687741273d121586b83745280c57f7e9d3297 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 07 八月 2023 17:51:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-management-system
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..7128e26 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>
@@ -79,5 +75,10 @@
* 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
* @return
*/
- List<User> selectUser();
+ List<Map> selectUser();
+
+ /**
+ * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+ */
+ List<Map<String, Object>> getUserNameAndId();
}
--
Gitblit v1.9.3