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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

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

@@ -35,11 +35,12 @@

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

   List<SysLaboratory> getSysLaboratoryListByUserId(String userId);


    List<Map> getPersonInChargeByProjects(String project);
}