From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 3935273..752f5f4 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -20,8 +20,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.lang.entity.Land;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.vo.UserVO;
import java.util.List;
@@ -61,4 +63,10 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ /**
+ * 查询用户信息
+ * @param user
+ * @return
+ */
+ List<User> getUserList(@Param("user") UserVO user);
}
--
Gitblit v1.9.3