From 2e1a9c064309e60047473c78f0dd3a88c726bb8d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 10:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
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