Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -857,11 +857,11 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			var rightAxisDate time.Time
 			if jumpYear == 1 {
 				latestDate = latestDate.AddDate(-1, 0, 0)
-				latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(),xStartDate)
-				rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
-				if err != nil {
-					return
-				}
+			}
+			latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(),xStartDate)
+			rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
+			if err != nil {
+				return
 			}
 
 			newDataList := make([]*data_manage.EdbDataList, 0)