From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 8291c99..29107b5 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
@@ -75,7 +75,7 @@
      * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
      * @return
      */
-    List<User> selectUser();
+    List<Map<String,Object>> selectUser();
 
     /**
      * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d

--
Gitblit v1.9.3