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

疯狂的狮子li

2022-01-07 d9a0de20f89e61ca44be5a60d2344afafedad376

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

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

    public CaptchaException() {
        super("user.jcaptcha.error", null);
        super("user.jcaptcha.error");
    }
}