接口文档的支持

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -243,16 +243,6 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             // 当前合并組中添加需要合并的列
             mergerGroup.get(group).add(column.getName());
         }
-
-        // 合并数据配置
-        for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
-            ExportColumn column = this.config.getColumns().get(columnPos);
-            if (column.getWidth() < 1) {
-                sheet.autoSizeColumn(columnPos, true);
-            } else {
-                sheet.setColumnWidth(columnPos, getUnit(column.getWidth()));
-            }
-        }
     }
 
     /**
@@ -344,6 +334,16 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             return this;
         }
 
+        // 合并数据配置
+        for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
+            ExportColumn column = this.config.getColumns().get(columnPos);
+            if (column.getWidth() < 1) {
+                sheet.autoSizeColumn(columnPos, true);
+            } else {
+                sheet.setColumnWidth(columnPos, getUnit(column.getWidth()));
+            }
+        }
+
         try {
             OutputStream out = new FileOutputStream(this.getFileName());
             try {