From 20e1449578ac0e558dc038e302001d3a6819ab2c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 11:52:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java |    4 ++++
 1 files changed, 4 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 96fd330..f8789fc 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java
@@ -3,6 +3,7 @@
 import com.nanometer.smartlab.entity.SysLaboratory;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by cmower on 17/11/20.
@@ -31,4 +32,7 @@
 
 	void insertSysReagentList(List<SysLaboratory> sysLaboratoryList);
 
+    void exportLab2Excel(List<Map> list) throws  Exception;
+
+	List<Map> exportLabList(String type, String name);
 }

--
Gitblit v1.9.2