Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-11-25 af25588b88a727b6c945796e3cf34ed3d4f05e89

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java

@@ -47,6 +47,6 @@
    }

    public UserDetails createLoginUser(SysUser user) {
        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
        return new LoginUser(user.getUserId(), user.getDeptId(), user.getUserName(), user.getPassword(), permissionService.getMenuPermission(user));
    }
}