From 5d06180456819a8d3c5a092597c1f466562f1cd4 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 22 九月 2021 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/nanometer/smartlab/dao/SysUserDao.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index c2502aa..c9591fe 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -60,4 +60,8 @@
 
     List<Map> getExportUserList(@Param("arp") String arp,@Param("name") String name, @Param("departmentName") String departmentName,
                                 @Param("project") String project,@Param("company") String company);
+
+    List<String> getLibrarianEmail();
+
+    List<SysUser> getUserByName(String approveUserName);
 }

--
Gitblit v1.9.2