Commit 536e9672 authored by yanzg's avatar yanzg

接口文档的支持

parent 7fbe5589
...@@ -225,6 +225,9 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -225,6 +225,9 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
// 合并数据配置 // 合并数据配置
for (ExportColumn column : this.config.getColumns()) { for (ExportColumn column : this.config.getColumns()) {
if (!column.isMerger()) {
continue;
}
// 获取需要合并的組,不能为null // 获取需要合并的組,不能为null
String group = StringHelper.getFirst(column.getMegerGroup()); String group = StringHelper.getFirst(column.getMegerGroup());
column.setMegerGroup(group); column.setMegerGroup(group);
......
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