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

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

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