From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 232f21d..27aa78b 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
@@ -4,14 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
/**
* <p>
@@ -24,7 +19,9 @@
public interface UserMapper extends BaseMapper<User> {
Map<String, String> selectUserByUserId(int userId);
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+ IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
- List<Map> selectUser();
+ List<Map<String,Object>> selectUser();
+
+
}
--
Gitblit v1.9.3