From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 18 Jan 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
index 63b881b..f70dfed 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -33,4 +33,7 @@
     List<Map> exportExcelList(String laboratoryType, String laboratoryName);
 
     void export2Excel(List<Map> list) throws Exception;
+
+    List<String> selectProjectsByContainerCode(String containerCode);
+
 }

--
Gitblit v1.9.2