Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 f3b14ef7006c2c03e1dbef18504088f119ec5782

 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);
}