Merge branch 'eta/1.7.5' into debug

controllers/data_manage/excel/excel_info.go

@@ -1182,6 +1182,7 @@ func (c *ExcelInfoController) AddDraft() {
 // @Title 获取excel表格的table数据
 // @Description 获取excel表格的table数据接口
 // @Param   UniqueCode   query   string  true       "表格code"
+// @Param   FromScene   query   int  true       "场景来源，1：智能研报，2：研报列表；3：英文研报；4：中文PPT；5：英文PPT"
 // @Success 200 {object} response.ExcelTableDetailResp
 // @router /excel_info/table_data [get]
 func (c *ExcelInfoController) GetExcelTableData() {

services/excel/lucky_sheet.go

@@ -1540,9 +1540,10 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 				// 数据值
 				for _, v := range data.Data {
 					dataCol = append(dataCol, LuckySheetDataValue{
-						Value:     v.Data[i].Value,
-						Monitor:   v.Data[i].ShowValue,
-						MergeCell: LuckySheetDataConfigMerge{},
+						Value:      v.Data[i].Value,
+						Monitor:    v.Data[i].ShowValue,
+						MergeCell:  LuckySheetDataConfigMerge{},
+						Background: "#ffefdd",
 					})
 				}