|
@@ -22,7 +22,7 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
|
|
|
private final List<Integer> skuRowIndex = new ArrayList<>();
|
|
|
|
|
|
// 订单需要合并的列
|
|
|
- private final List<Integer> orderColIndex = Arrays.asList(0, 1, 2, 18, 19);
|
|
|
+ private final List<Integer> orderColIndex = Arrays.asList(0, 1, 2, 18);
|
|
|
// 订单无需合并的行
|
|
|
private final List<Integer> orderRowIndex = new ArrayList<>();
|
|
|
|