From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/service/SysUserService.java |    4 ++++
 1 files changed, 4 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..8915b4d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -48,4 +48,8 @@
     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;
 }

--
Gitblit v1.9.2