From 1afdf3622484b9a54c4cc4642e38bbf5c815884f Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期四, 04 二月 2021 17:48:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java index e07e4cd..6861643 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java @@ -35,7 +35,7 @@ void exportLab2Excel(List<Map> list) throws Exception; - List<Map> exportLabList(String type, String name); + List<Map> exportLabList(String type, String name,String project); List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project); -- Gitblit v1.9.2