diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml
index 48dd223..e738fc2 100644
--- a/easypoi-annotation/pom.xml
+++ b/easypoi-annotation/pom.xml
@@ -4,7 +4,7 @@
cn.afterturn
easypoi
- 3.0.2-SNAPSHOT
+ 3.0.2
easypoi-annotation
基础注解类,解耦合
diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml
index d22b9ad..039c7d3 100644
--- a/easypoi-base/pom.xml
+++ b/easypoi-base/pom.xml
@@ -4,7 +4,7 @@
cn.afterturn
easypoi
- 3.0.2-SNAPSHOT
+ 3.0.2
easypoi-base
diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java
index f7b11c6..69cced0 100644
--- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java
+++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java
@@ -337,6 +337,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
Object t = its.next();
setForEeachRowCellValue(true, cell.getRow(), cell.getColumnIndex(), t, columns, map,
rowspan, colspan, mergedRegionHelper);
+ if(cell.getRow().getCell(cell.getColumnIndex() + colspan) == null){
+ cell.getRow().createCell(cell.getColumnIndex() + colspan);
+ }
cell = cell.getRow().getCell(cell.getColumnIndex() + colspan);
}
if (isCreate) {
diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml
index b509c13..915f2d5 100644
--- a/easypoi-web/pom.xml
+++ b/easypoi-web/pom.xml
@@ -4,7 +4,7 @@
cn.afterturn
easypoi
- 3.0.2-SNAPSHOT
+ 3.0.2
easypoi-web
diff --git a/history.md b/history.md
index 2ae72af..a91e910 100644
--- a/history.md
+++ b/history.md
@@ -2,6 +2,14 @@
--------------------------
版本修改
--------------------------
+ - 3.0.2 版本 新包名版本,看自己需求跟新
+ - word 遍历样式复制
+ - 导入校验返回增强
+ - 导入校验,校验组参数
+ - Excel--html图标不在单独生成
+ - Excel模板导出加入了图片支持
+ - 修复了dubbo处理问题
+
- 3.0.1 版本 新包名版本,看自己需求跟新
- 加了一个numformat 属性,方便格式化数字
- 修复view 再特定情况无法找到的bug
diff --git a/pom.xml b/pom.xml
index bf78adc..175fdc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
cn.afterturn
easypoi
- 3.0.2-SNAPSHOT
+ 3.0.2
pom
easypoi
@@ -38,7 +38,7 @@
- 3.0.2-SNAPSHOT
+ 3.0.2
3.16
2.9.1
16.0.1