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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

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