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

gdg

2021-02-01 8beaf701a900ddd5a0a482f425080635ff55166d

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