Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -3867,13 +3867,15 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						} else {
 							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
 						}
-						startDate, err := time.Parse(utils.FormatDate, startDateStr)
-						if err != nil {
+						startDate, e := time.Parse(utils.FormatDate, startDateStr)
+						if e != nil {
+							err = e
 							return
 						}
 						endDateStr := fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
-						endDate, err := time.Parse(utils.FormatDate, endDateStr)
-						if err != nil {
+						endDate, e := time.Parse(utils.FormatDate, endDateStr)
+						if e != nil {
+							err =e
 							return
 						}
 						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
@@ -3922,13 +3924,15 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						} else {
 							startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
 						}
-						startDate, err := time.Parse(utils.FormatDate, startDateStr)
-						if err != nil {
+						startDate, e := time.Parse(utils.FormatDate, startDateStr)
+						if e != nil {
+							err = e
 							return
 						}
 						endDateStr := fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
-						endDate, err := time.Parse(utils.FormatDate, endDateStr)
-						if err != nil {
+						endDate, e := time.Parse(utils.FormatDate, endDateStr)
+						if e != nil {
+							err =e
 							return
 						}
 						newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)