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

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

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

@@ -47,5 +47,9 @@

    List<Map> exportExcelList(Map params);

    String selectProjectsByContainerCode(String containerCode);
    List<String> selectProjectsByContainerCode(String containerCode);

    int delSlcIds(List<String> ids);

    int getSysLaboratoryContainerExist(Map<String, Object> params);
}