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

gdg

2021-02-25 db523e0fdf7801cdc01f10886f2c9aec04e711bb

 src/main/java/com/nanometer/smartlab/service/SysUserService.java

@@ -16,6 +16,8 @@

    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);
    int getUserCountInProject(String arp, String name,String departmentName,String project,String company);
    List<SysUser> getUserInProject(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
    SysUser getSysUser(String id);
    SysUser getSysUserForSuppllier(String id);
    SysUser getSysUserByAccount(String account);