From b510b274d9003d0a643a43c1e01b1382d84f78ec Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 16 六月 2021 15:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
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