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

gdg

2021-01-26 f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4

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

@@ -2,6 +2,8 @@

import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.entity.dto.SysUserDto;

import java.util.List;
@@ -39,6 +41,7 @@

    List<SysUserDto> getUserInfo();

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

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