Merge branch 'eta/1.7.5' into debug

services/excel/lucky_sheet.go

@@ -1014,10 +1014,15 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 
 				// 数据值
 				for _, v := range data.Data {
+					background := ``
+					if v.Data[i].DataType == 5 {
+						background = "#ffefdd"
+					}
 					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: background,
 					})
 				}
 
@@ -1128,10 +1133,15 @@ func GetTableDataByCustomData(excelType int, data request.TableDataReq) (selfTab
 
 			// 指标数据列
 			for _, tmpData := range tmpEdbInfo.Data {
+				background := ``
+				if tmpData.DataType == 5 {
+					background = "#ffefdd"
+				}
 				dataCol = append(dataCol, LuckySheetDataValue{
-					Value:     tmpData.Value,
-					Monitor:   tmpData.ShowValue,
-					MergeCell: LuckySheetDataConfigMerge{},
+					Value:      tmpData.Value,
+					Monitor:    tmpData.ShowValue,
+					MergeCell:  LuckySheetDataConfigMerge{},
+					Background: background,
 				})
 			}