add 新增 easyexcel 单元格合并注解与处理器

疯狂的狮子li

2022-05-31 f6fa17a3a817f8cc1743cb881aa9927227ed2867

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