From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 25 Jun 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
index df8cdec..b4685e6 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/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);
}
--
Gitblit v1.9.2