From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
index 934aae4..0fa11d9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
@@ -47,5 +47,5 @@
List<Map> exportExcelList(Map params);
- String selectProjectsByContainerCode(String containerCode);
+ List<String> selectProjectsByContainerCode(String containerCode);
}
--
Gitblit v1.9.2