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

疯狂的狮子li

2022-01-17 8052d759570bcf6a01aac55733365c8c306623a4

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