From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java | 3 ++-
1 files changed, 2 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..2689105 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -35,11 +35,12 @@
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);
List<SysLaboratory> getSysLaboratoryListByUserId(String userId);
+ List<Map> getPersonInChargeByProjects(String project);
}
--
Gitblit v1.9.2