fix bug

liaochong · Nov 14, 2024 · 430d6b8 · 430d6b8
1 parent 83c8581
commit 430d6b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.github.liaochong</groupId>
     <artifactId>myexcel</artifactId>
-    <version>4.5.4</version>
+    <version>4.5.5</version>
     <packaging>jar</packaging>
 
     <name>myexcel</name>

diff --git a/src/main/java/com/github/liaochong/myexcel/core/AbstractSimpleExcelBuilder.java b/src/main/java/com/github/liaochong/myexcel/core/AbstractSimpleExcelBuilder.java
@@ -331,7 +331,7 @@ protected Tr createTr(List<Pair<? extends Class, ?>> contents) {
         List<Td> tdList = IntStream.range(0, contents.size()).mapToObj(index -> {
             Td td = new Td(0, index);
             Pair<? extends Class, ?> pair = contents.get(index);
-            if (pair.getRepeatSize() != null) {
+            if (configuration.autoMerge && pair.getRepeatSize() != null) {
                 td.setRowSpan(pair.getRepeatSize());
             }
             this.setTdContent(td, pair);