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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

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

@@ -41,7 +41,7 @@

    List<SysUserDto> getUserInfo();

    HazardousWasteUser getUserByAccount(String account);
    HazardousWasteUser getUserByAccount(String account,String name);

    List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
}