From 502b2744531dd914c1feb2219ff7b50c3d8d97d9 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 22 Nov 2023 20:29:13 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InsideOutSideMeetingController.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java
index b0b3895a..78a5f5c3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java
@@ -169,11 +169,11 @@ public class InsideOutSideMeetingController extends BaseController<InsideOutside
             nowFile.mkdirs();
             String fileName2 = "导入模板.xls";
             HSSFSheet sheetItems = workbook.createSheet("模板");
-            sheetItems.setDefaultColumnWidth(13);
+            sheetItems.setDefaultColumnWidth(12);
             Row rowHeader = sheetItems.createRow(1);//开始创建标题行
-            sheetItems.addMergedRegion(new CellRangeAddress(0, 0, 0, 13));
+            sheetItems.addMergedRegion(new CellRangeAddress(0, 0, 0, 12));
             Row row2 = sheetItems.createRow(0);//开始创建填写说明
-            String exportFieldName = FieldConvertUtil.exportFieldNamesInsideOutsideMeeting + FieldConvertUtil.exportFieldNamesMeetingTopic;
+            String exportFieldName = FieldConvertUtil.exportFieldNamesInsideOutsideMeeting + "," + FieldConvertUtil.exportFieldNamesMeetingTopic;
             if (StringUtils.isNotBlank(exportFieldName)) {
                 String[] headerArr = exportFieldName.split(",");
                 for (int i=0;i < headerArr.length; i++) {