From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 4e78a8f..add3f16 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -5,8 +5,11 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -22,4 +25,8 @@
Map<String, String> selectUserByUserId(int userId);
IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+
+ List<Map<String,Object>> selectUser();
+
+
}
--
Gitblit v1.9.3