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

疯狂的狮子li

2021-12-28 948ad860498cc6c482ee492611b3394f7e661741

 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -70,7 +70,7 @@
    /**
     * 获取用户缓存信息
     */
    public LoginUser getUser() {
    public LoginUser getLoginUser() {
        return LoginUtils.getLoginUser();
    }