Merge remote-tracking branch 'remotes/origin/yufei' into master

lyfO_o

2021-09-16 074c6c4389938fc38e82b6258b8ebab95fb5aff9

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.java

@@ -57,4 +57,11 @@
    int getUserCountInProject(Map params);

    List<SysUser> getUserInProject(Map params);

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