Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-15 b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0

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

@@ -69,9 +69,14 @@
    private String os;

    /**
     * 权限列表
     * 菜单权限
     */
    private Set<String> permissions;
    private Set<String> menuPermissions;

    /**
     * 角色权限
     */
    private Set<String> rolePermissions;

    /**
     * 用户名
@@ -82,20 +87,6 @@
     * 密码
     */
    private String password;

    public LoginUser(String username, String password, Set<String> permissions) {
        this.username = username;
        this.password = password;
        this.permissions = permissions;
    }

    public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
        this.userId = userId;
        this.deptId = deptId;
        this.username = username;
        this.password = password;
        this.permissions = permissions;
    }

    @JsonIgnore
    @Override