From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 21 六月 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

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

diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 4d591aa..861ba03 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -48,4 +48,11 @@
     List<LaboratoryVo.LaboratoryUser> getUserByProject(String project);
 
     List<SysUser> getUserByArp(String arp);
+
+    List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company);
+
+    void exportUser2Excel(List<Map> list)throws Exception;
+
+    List<String> getLibrarianEmail();
+
 }

--
Gitblit v1.9.2