From 9ddb32175b3624ba3a3cedbfc009d9d526391a20 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 11:54:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-after
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 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 7b87483..744ad7e 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
@@ -74,7 +74,7 @@
}
@Override
- public List<User> selectUser() {
+ public List<Map> selectUser() {
return userMapper.selectUser();
}
--
Gitblit v1.9.3