Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-22 a49acae90960af1f7f30ba7cf0cc9bda8d6e4e93

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -36,6 +36,15 @@
     * 用户标识
     */
    public static final String USER_KEY = "user_key";
    
    /**
     * 用户类型（system/applet）
     */
    public static final String USER_TYPE = "user_type";
    /**
     * 小程序登录用户标识
     */
    public static final String USER_APPLET_KEY = "user_applet_key";

    /**
     * 登录用户