fix：优化自定义表格

services/excel/lucky_sheet.go

@@ -926,6 +926,7 @@ func (item *LuckySheetData) GetTableDataByLuckySheetDataStrBak() (selfTableData
 // GetTableDataByCustomData 通过自定义表格数据获取表格数据
 func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTableData TableData, err error) {
 	tableDataList := make([][]LuckySheetDataValue, 0)
+	mergeList := make([]TableDataMerge, 0)
 
 	// 指标数
 	lenEdb := len(data.Data)
@@ -940,6 +941,12 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 	}
 	// 指标列：1；指标行：2
 	if excelType == 1 {
+		mergeList = append(mergeList, TableDataMerge{
+			StartRowIndex:    0,
+			StartColumnIndex: 0,
+			MergeRowNum:      1,
+			MergeColumnNum:   0,
+		})
 		// 第一行
 		{
 			firstCol := make([]LuckySheetDataValue, 0)
@@ -976,7 +983,7 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 		// 第二行
 		{
 			secondCol := make([]LuckySheetDataValue, 0)
-			//secondCol = append(secondCol, LuckySheetDataValue{})
+			secondCol = append(secondCol, LuckySheetDataValue{})
 
 			for _, v := range data.Data {
 				name := v.Unit + " / " + v.Frequency
@@ -1034,6 +1041,13 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 	} else {
 		// 指标行
 
+		mergeList = append(mergeList, TableDataMerge{
+			StartRowIndex:    0,
+			StartColumnIndex: 0,
+			MergeRowNum:      0,
+			MergeColumnNum:   1,
+		})
+
 		// 第一行
 		{
 			firstCol := make([]LuckySheetDataValue, 0)
@@ -1049,6 +1063,7 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 					Cs:     2, //合并的列数
 				},
 			})
+			firstCol = append(firstCol, LuckySheetDataValue{})
 
 			// 日期列
 			for _, v := range data.Data[0].Data {
@@ -1133,6 +1148,7 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 
 	}
 
+	selfTableData.MergeList = mergeList
 	selfTableData.TableDataList = tableDataList
 
 	return