Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

 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);