接口文档的支持

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

@@ -295,21 +295,16 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             String columnName = column.getName();
             String value = rowHandle.get(t, columnName);
 
+            // 当不需要合并历史记录时，则创建新的内容
+            Cell cell = createCell(row, columnPos, value);
             // 判断列是否需要合并
             if (column.isMerger()) {
-
                 ExcelMergerData mergerData = mergerGroupData.get(column.getMegerGroup());
                 // 判断是否需要合并历史记录
                 if (mergerData.getRowCell() > 1) {
                     // 合并历史记录单元格
                     mergerData(mergerData, columnPos);
-                } else {
-                    // 当不需要合并历史记录时，则创建新的内容
-                    Cell cell = createCell(row, columnPos, value);
                 }
-            } else {
-                // 不合并时直接写入单元格内容
-                Cell cell = createCell(row, columnPos, value);
             }
         }
 

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

@@ -24,10 +24,10 @@ public class ExportData {
     public static final short SUB_TITLE_HEIGHT = 40;
 
     @ApiModelProperty(notes = "头默认高度")
-    public static final short HEAD_HEIGHT = 20;
+    public static final short HEAD_HEIGHT = 40;
 
     @ApiModelProperty(notes = "行默认高度")
-    public static final short ROW_HEIGHT = 20;
+    public static final short ROW_HEIGHT = 30;
 
     @ApiModelProperty(notes = "列默认宽度")
     public static final short COLUMN_WIDTH = 120;