From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index a613193..5fd2f5b 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -14,8 +14,8 @@
*/
public interface SysUserService {
- List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize);
- int getSysUserTotalCount(String arp, String name,String departmentName);
+ List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
+ int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company);
SysUser getSysUser(String id);
SysUser getSysUserForSuppllier(String id);
SysUser getSysUserByAccount(String account);
--
Gitblit v1.9.2