excel合并单元格修复

gic-enterprise-download/src/main/java/com/gic/download/utils/ExcelUtils.java

@@ -222,8 +222,11 @@ public class ExcelUtils {
                 n++;
                 continue;
             }
+            if (n != 1) {
+                //如果n = 1，就是一个单元格，合并操作会报错
                 //创建第一行大标题
                 sheet.addMergedRegion(new CellRangeAddress(0, 0, n, (n + sonHeader.size() - 1)));
+            }
             //赋值
             for (int j = 0, sonLength = sonHeader.size(); j < sonLength; j ++) {
                 Cell cell2 = row2.createCell(n++);