From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 899c9cf..eb7b820 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -75,10 +75,8 @@
}
@Override
- public List<Map<String, Object>> getUserNameAndId() {
- LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
- return userMapper.selectMaps(wrapper);
+ public List<User> selectUser() {
+ return userMapper.selectUser();
}
@Override
--
Gitblit v1.9.3