Merge branch 'ETA_2.4.0' into debug

models/request/mixed_table.go

@@ -168,6 +168,7 @@ type MixCellShowStyle struct {
 	Color           string      `description:"颜色值，#RRG" json:"color"`
 	BackgroundColor string      `description:"背景颜色值，#RRG" json:"background-color"`
 	Align           string      `description:"对齐方式：left|center|right" json:"align"`
+	FontSize        string      `description:"字体大小" json:"font-size"`
 }
 
 type DateDataBeforeAfterReq struct {

services/excel/lucky_sheet.go

@@ -1267,6 +1267,9 @@ func GetTableDataByMixedTableData(config [][]request.MixedTableCellDataReq, hide
 						tmp.HorizontalType = 2
 						tmp.Ht = 2
 					}
+					if styleConfig.FontSize != "" {
+						tmp.Fs = styleConfig.FontSize
+					}
 					tmp.Monitor = cell.ShowFormatValue
 					// 如果没有showValue, 则使用value
 					if cell.ShowValue == "" {