接口文档的支持

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

@@ -154,6 +154,10 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         if (this.workbook != null) {
             throw new CodeException("Excel已初始化");
         }
+        // 创建合并对象数据检测
+        mergerGroup = new HashMap<>();
+        mergerGroupData = new HashMap<>();
+
         // 创建工作簿对象
         workbook = new XSSFWorkbook();
         sheet = workbook.createSheet();
@@ -167,10 +171,6 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
 
         writeHead(head);
         rowIndex += head.getTotalRow();
-
-        // 创建合并对象数据检测
-        mergerGroup = new HashMap<>();
-        mergerGroupData = new HashMap<>();
     }
 
     /**
@@ -227,6 +227,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         for (ExportColumn column : this.config.getColumns()) {
             // 获取需要合并的組，不能为null
             String group = StringHelper.getFirst(column.getMegerGroup());
+            column.setMegerGroup(group);
             if (!mergerGroup.containsKey(group)) {
                 mergerGroup.put(group, new ArrayList<>());
                 mergerGroupData.put(group, new ExcelMergerData());