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

gdg

2020-12-15 8932ae2a8dc22513c2b7925997dfb65983ea1d19

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

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

    Map selectLocationByContainerCode(String containerCode);

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

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