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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

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

@@ -35,7 +35,7 @@

    public SysUser selectByAccount(SysUser user);

    Map getUser(String id);
    SysUser getUser(String id);

    void insertUserFavor(Map params);

@@ -51,4 +51,13 @@
    HazardousWasteUser getUserByAccount(Map params);

    List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);

    List<SysUser> getUserByArp(String arp);

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