Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -24,7 +24,7 @@
    /**
     * 部门ID
     */
    private Long deptId;
    private String deptId;

    /**
     * 用户唯一标识
@@ -81,7 +81,7 @@
        this.permissions = permissions;
    }

    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
    public LoginUser(Long userId, String deptId, SysUser user, Set<String> permissions)
    {
        this.userId = userId;
        this.deptId = deptId;
@@ -99,12 +99,12 @@
        this.userId = userId;
    }

    public Long getDeptId()
    public String getDeptId()
    {
        return deptId;
    }

    public void setDeptId(Long deptId)
    public void setDeptId(String deptId)
    {
        this.deptId = deptId;
    }