From 9ed9adbc0878cfc792206d0c246787d622407402 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 18 六月 2021 13:07:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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