Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 f3b14ef7006c2c03e1dbef18504088f119ec5782

 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);
}