订单合并

sd-business/src/main/java/com/sd/business/service/statement/impl/DocumentByOrderExcelCellMergeStrategy.java

@@ -69,7 +69,7 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
         // 合并订单列
         if (orderColIndex.contains(curColIndex)) {
             for (int i = 1; i < orderRowIndex.size(); i++) {
-                Integer beginRow = orderRowIndex.get(i - 1) + 1;
+                int beginRow = orderRowIndex.get(i - 1) + 1;
                 Integer endRow = orderRowIndex.get(i);
                 mergeWithPrevRow(sheet, beginRow, endRow, curColIndex);
             }
@@ -78,7 +78,7 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
         // 合并sku列
         else if (skuColIndex.contains(curColIndex)) {
             for (int i = 1; i < skuRowIndex.size(); i++) {
-                Integer beginRow = skuRowIndex.get(i - 1) + 1;
+                int beginRow = skuRowIndex.get(i - 1) + 1;
                 Integer endRow = skuRowIndex.get(i);
                 mergeWithPrevRow(sheet, beginRow, endRow, curColIndex);
             }