Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -3861,7 +3861,13 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
-						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						var newDate time.Time
+						if seasonConfig.JumpYear == 1 {
+							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
+						} else {
+							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						}
+
 						// 处理上下限列表
 						if value, ok := maxValueMap[newDate]; ok {
 							if value < handleDataMap[date] {
@@ -3897,8 +3903,12 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						if dateTime.Month() == 2 && dateTime.Day() == 29 {
 							continue
 						}
-						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
-
+						var newDate time.Time
+						if seasonConfig.JumpYear == 1 {
+							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
+						} else {
+							newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
+						}
 						if value, ok := maxValueMap[newDate]; ok {
 							if value < vv.Value {
 								maxValueMap[newDate] = vv.Value