From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' 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