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

xlsea

2024-12-16 4d566071db7853c66805a1ffac2fd9c93a6aac8a

 ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -89,6 +89,13 @@
    }

    /**
     * 获取用户id
     */
    public static String getUserIdStr() {
        return Convert.toStr(getExtra(USER_KEY));
    }

    /**
     * 获取用户账户
     */
    public static String getUsername() {