From 98933984fa1353d298a5117fb2a2d044fc51af93 Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 22 六月 2024 13:18:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 642cede..8c2148c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -1,12 +1,11 @@
package com.ruoyi.system.mapper;
-import java.util.ArrayList;
-import java.util.List;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
-import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.SysUser;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
/**
* 用户表 数据层
@@ -129,7 +128,9 @@
*/
public SysUser checkEmailUnique(String email);
- PageInfo<SysUser> getList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("phonenumber") String phonenumber);
+ PageInfo<SysUser> getList(@Param("pageInfo") PageInfo<SysUser> pageInfo,
+ @Param("nickName") String nickName, @Param("phonenumber") String phonenumber,
+ @Param("status") Integer status);
PageInfo<SysUser> getAllList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("ids") List<Integer> collect);
--
Gitblit v1.7.1