Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-02 a6a3bb04cdaa334a2868d09b20518ed98575bccb

 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);
        }
    }