冲突和修改

gdg

2021-01-18 ee2678ecb9e8d686252feed920a7b2284acd54da

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