|
@@ -640,7 +640,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
|
// 表格合并,根据坐标
|
|
|
MergeCellRule mergeCellRule2 = MergeCellRule.builder().map(MergeCellRule.Grid.of(0, 0), MergeCellRule.Grid.of(1, 0)).
|
|
|
map(MergeCellRule.Grid.of(0, 1), MergeCellRule.Grid.of(0, list.size())).
|
|
|
- map(MergeCellRule.Grid.of(0, rowRenderData2.length - 1), MergeCellRule.Grid.of(1, rowRenderData2.length - 1)).
|
|
|
+ map(MergeCellRule.Grid.of(0, totalCell.size() - 1), MergeCellRule.Grid.of(1, totalCell.size() - 1)).
|
|
|
build();
|
|
|
|
|
|
Tables.TableBuilder tableBuilder2 = Tables.ofPercentWidth(tbPercentWidth);
|