Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

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