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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java

@@ -1,6 +1,8 @@
package com.nanometer.smartlab.dao;

import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import java.util.List;
@@ -29,4 +31,6 @@
    public  void updateLabExport(SysLaboratory sysLaboratory);

    List<Map> exportLabList(Map params);

    List<LaboratoryVo.Laboratory> getLaboratoryByProject(@Param("project") String project);
}