Commit 534f8304 authored by yanzg's avatar yanzg

接口文档的支持

parent 01ee1c77
...@@ -243,6 +243,12 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -243,6 +243,12 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
// 当前合并組中添加需要合并的列 // 当前合并組中添加需要合并的列
mergerGroup.get(group).add(column.getName()); mergerGroup.get(group).add(column.getName());
} }
// 合并数据配置
for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
ExportColumn column = this.config.getColumns().get(columnPos);
sheet.setColumnWidth(columnPos, column.getWidth());
}
} }
/** /**
......
...@@ -74,6 +74,9 @@ public class ExportColumn { ...@@ -74,6 +74,9 @@ public class ExportColumn {
} }
public short getWidth() { public short getWidth() {
if (this.width < 1) {
return ExportData.COLUMN_WIDTH;
}
return width; return width;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment