Merge remote-tracking branch 'origin/master'

吴羡

3 天以前 e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff

 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -91,11 +91,6 @@
    public static final String PERMISSION_DELIMITER = ",";

    /**
     * 验证码有效期（分钟）
     */
    public static final Integer CAPTCHA_EXPIRATION = 2;

    /**
     * 令牌
     */
    public static final String TOKEN = "token";