From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 ac8d757..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
@@ -72,6 +72,12 @@
String selectByUserId(Integer userId);
/**
+ * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+ * @return
+ */
+ List<Map> selectUser();
+
+ /**
* 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
*/
List<Map<String, Object>> getUserNameAndId();
--
Gitblit v1.9.3