From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期三, 03 二月 2021 16:10:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java | 2 +- 1 files changed, 1 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..737f8dd 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java @@ -31,7 +31,7 @@ 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; -- Gitblit v1.9.2