From 738e754797fb7be2fc389bc91a156e084dd2c62a Mon Sep 17 00:00:00 2001 From: chenrui Date: Wed, 3 Jan 2024 10:23:43 +0800 Subject: [PATCH] =?UTF-8?q?---author:chenrui---date:2024/1/3-----for:[issu?= =?UTF-8?q?e/#5248]=E5=8A=A0=E5=BC=BA=E7=BB=A7=E6=89=BF=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E4=BE=BF=E5=88=A9=E6=80=A7---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecgframework/poi/excel/ExcelExportUtil.java | 4 +++- .../org/jeecgframework/poi/excel/annotation/Excel.java | 4 ++++ .../\344\277\256\346\224\271\346\227\245\345\277\227.log" | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java index 088ac0a..938d80d 100644 --- a/autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java @@ -40,7 +40,9 @@ * @version 1.0 * @date 2013-10-17 */ -public final class ExcelExportUtil { +//update-begin---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性(删除final)------------ +public class ExcelExportUtil { +//update-end---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性(删除final)------------ //update-begin---author:liusq Date:20211217 for：[LOWCOD-2521]【autopoi】大数据导出方法【全局】---- //单sheet最大值 public static int USE_SXSSF_LIMIT = 100000; diff --git a/autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java b/autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java index 083faef..06310c0 100644 --- a/autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java +++ b/autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java @@ -19,6 +19,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.lang.annotation.Inherited; /** * Excel 导出基本注释 @@ -28,6 +29,9 @@ */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) +//update-begin---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性------------ +@Inherited +//update-end---author:chenrui ---date:20231221 for：[issue/#5248]加强继承扩展便利性------------ public @interface Excel { /** diff --git "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" index 60bb630..f8dc117 100644 --- "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" +++ "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" @@ -23,4 +23,9 @@ autopoi-framework\autopoi\src\main\java\org\jeecgframework\poi\excel\export\base ---author:scott ---date:2023-12-08 for：代码写法兼容改造--- org\jeecgframework\poi\excel\annotation\Excel.java org\jeecgframework\poi\excel\imports\ExcelImportServer.java ----author:scott ---date:2023-12-08 for：代码写法兼容改造--- \ No newline at end of file +---author:scott ---date:2023-12-08 for：代码写法兼容改造--- + +---author:chenrui---date:2024/1/3-----for:[issue/#5248]加强继承扩展便利性--- +autopoi/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java +autopoi/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +---author:chenrui---date:2024/1/3-----for:[issue/#5248]加强继承扩展便利性--- \ No newline at end of file