Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子Li

2022-10-12 95010d4a4c21cd53b78f51cbd518a315a8861fbc

 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java

@@ -9,6 +9,6 @@
    private static final long serialVersionUID = 1L;

    public CaptchaExpireException() {
        super("user.jcaptcha.expire", null);
        super("user.jcaptcha.expire");
    }
}