Merge branch 'feature/1.0.5_chartinfo' into debug

services/data/chart_info.go

@@ -900,7 +900,11 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 					beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
 					if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
 						newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
+					} else {
+						newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
 					}
+				} else {
+					newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
 				}
 				timestamp := newItemDate.UnixNano() / 1e6
 				v.DataTimestamp = timestamp
@@ -916,7 +920,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 					dateItem.CuttingDataTimestamp = v.DataTimestamp
 					dataMap[k] = dateItem
 				}
-				break
+				//break
 			}
 		}
 	}