From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 26 Jan 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
index f8789fc..b7733c8 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -1,6 +1,7 @@
 package com.nanometer.smartlab.service;
 
 import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 
 import java.util.List;
 import java.util.Map;
@@ -35,4 +36,6 @@
     void exportLab2Excel(List<Map> list) throws  Exception;
 
 	List<Map> exportLabList(String type, String name);
+
+	List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project);
 }

--
Gitblit v1.9.2