From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..3b9df69 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,9 +7,13 @@
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>
@@ -72,7 +76,8 @@
String selectByUserId(Integer userId);
/**
- * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+ * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+ * @return
*/
- List<Map<String, Object>> getUserNameAndId();
+ List<User> selectUser();
}
--
Gitblit v1.9.3