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/service/ISysUserService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index b2656af..f8154ad 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -211,7 +211,8 @@
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
- PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber);
+ PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickname, String phonenumber,
+ Integer status);
PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect);
--
Gitblit v1.7.1