From 531155f4bce6b9a09fa3167fdd45655c882fb219 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 14 八月 2024 10:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 63ba0b2..c215705 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
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.management.api.model.TCompanyShopToUser;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.query.GetSysUserList;
/**
* 用户 业务层
@@ -209,7 +209,7 @@
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
- PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber);
+ PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList);
PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect);
--
Gitblit v1.7.1