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

gdg

2021-01-18 b02535c9a99324823812f6c2d08f066d8e1ba75f

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

@@ -29,4 +29,11 @@
    List<Map> getContainerPersonInCharge(String containerCode);

    Map selectLocationByContainerCode(String containerCode);

    List<Map> exportExcelList(String laboratoryType, String laboratoryName);

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

    List<String> selectProjectsByContainerCode(String containerCode);

}