From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java b/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
index 3e3f68f..14cc823 100644
--- a/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
+++ b/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
@@ -38,7 +38,7 @@
@Override
protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
for (Integer whichColumn : mergeWhichColumn) {
- CellRangeAddress cellRangeAddress = new CellRangeAddress(startRow, startRow + mergeRowNumber - 1, whichColumn - 1, whichColumn - 1);
+ CellRangeAddress cellRangeAddress = new CellRangeAddress(startRow, startRow + mergeRowNumber - 1, whichColumn, whichColumn);
sheet.addMergedRegionUnsafe(cellRangeAddress);
}
}
--
Gitblit v1.8.0