From 9619965a7a9cd4b8c9f41ef8d5d8aa44d62436c6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 08 七月 2024 17:39:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept' into dev_dept
---
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