Merge branch 'feature/eta1.0.5' into debug

models/chart.go

@@ -157,7 +157,7 @@ type EdbDataResult struct {
 }
 
 type QuarterData struct {
-	Year                 int
+	Year                 string
 	DataList             []*EdbDataList
 	CuttingDataTimestamp int64 `description:"切割的时间戳"`
 	ChartLegend          string

services/data/chart_info.go

@@ -479,6 +479,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*models.EdbDataList, latestDateS
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le
 		}
+		quarterItem.Year = quarterItem.ChartLegend
 		quarterItem.DataList = itemList
 		quarterItem.CuttingDataTimestamp = v.CuttingDataTimestamp
 
@@ -665,6 +666,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *models.EdbDataResult, latestDat
 		if le, ok := legendMap[v.ShowName]; ok {
 			quarterItem.ChartLegend = le
 		}
+		quarterItem.Year = quarterItem.ChartLegend
 		quarterItem.DataList = itemList
 		quarterItem.CuttingDataTimestamp = v.CuttingDataTimestamp
 
@@ -681,7 +683,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *models.EdbDataResult, latestDat
 	if result.List[0].Year != calendarPreYear || jumpYear == 1 {
 		itemList := make([]*models.EdbDataList, 0)
 		items := new(models.QuarterData)
-		//items.Year = calendarPreYear
+		//、items.Year = calendarPreYear
 		items.DataList = itemList
 
 		newResult := make([]*models.QuarterData, 0)