diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml index c23a631..6781119 100644 --- a/easypoi-annotation/pom.xml +++ b/easypoi-annotation/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.2.0 + 4.2.0.A easypoi-annotation base annotation diff --git a/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java index b1f0d08..1ca2372 100644 --- a/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java @@ -67,6 +67,11 @@ public @interface Excel { */ public int imageType() default 1; + /** + * 文字前缀,如1234567890112242335 变成`1234567890112242335 + */ + public String prefix() default ""; + /** * 文字后缀,如% 90 变成90% */ diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index 72f3765..6ed823f 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -4,7 +4,7 @@ cn.afterturn easypoi - 4.2.0 + 4.2.0.A easypoi-base diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelExportEntity.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelExportEntity.java index f5db35e..103ffb9 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelExportEntity.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/entity/params/ExcelExportEntity.java @@ -84,6 +84,10 @@ public class ExcelExportEntity extends ExcelBaseEntity implements Comparable cn.afterturn easypoi - 4.2.0 + 4.2.0.A easypoi-web diff --git a/pom.xml b/pom.xml index 067962c..ebf5ddb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.afterturn easypoi - 4.2.0 + 4.2.0.A pom easypoi @@ -46,7 +46,11 @@ +<<<<<<< HEAD 4.2.0 +======= + 4.1.3.A +>>>>>>> 支持前缀 4.1.1 2.9.1 16.0.1