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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

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

@@ -35,4 +35,6 @@
    List<LaboratoryVo.Laboratory> getLaboratoryByProject(@Param("project") String project);

    SysLaboratory getSysLaboratoryByName(String name);

    List<Map> getPersonInCharge(String project);
}