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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

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

@@ -1,5 +1,6 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.entity.SysUser;

@@ -31,10 +32,11 @@

    Map selectLocationByContainerCode(String containerCode);

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

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

    List<String> selectProjectsByContainerCode(String containerCode);

    boolean delBySlcIds(List<SysLaboratory> selectedList);
}