Merge remote-tracking branch 'origin/master'

李宇

2021-03-24 db3253cb595be3682157a632a77078cc513603c3

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

@@ -35,7 +35,7 @@

    void exportLab2Excel(List<Map> list) throws  Exception;

   List<Map> exportLabList(String type, String name);
   List<Map> exportLabList(String type, String name,String project);

   List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);