浏览代码

Merge branch 'feature/eta1.0.5' into debug

xyxie 1 年之前
父节点
当前提交
1fda343159
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      services/data/chart_info.go

+ 2 - 0
services/data/chart_info.go

@@ -491,6 +491,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*models.EdbDataList, latestDate
 		itemList := quarterMap[k]
 		quarterItem := new(models.QuarterData)
 		quarterItem.Years = v.ShowName
+		quarterItem.Year = v.ChartLegend
 		quarterItem.ChartLegend = v.ChartLegend
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le
@@ -742,6 +743,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *models.EdbDataResult, latestDat
 		itemList := quarterMap[k]
 		quarterItem := new(models.QuarterData)
 		quarterItem.Years = v.ShowName
+		quarterItem.Year = v.ChartLegend
 		quarterItem.ChartLegend = v.ChartLegend
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le