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

疯狂的狮子Li

2021-11-21 b9b1ec8f4163bab66cf22bba784bf48b72167e76

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