Merge branch 'feature/eta1.9.5_feature_good' into debug

# Conflicts:
#	services/data/future_good/profit_chart_info.go

services/data/future_good/profit_chart_info.go

@@ -330,7 +330,6 @@ func ProfitChartChartData(baseEdbInfo *data_manage.EdbInfo, baseDataListMap map[
 			//tmpN := (currDate.Year()-findDateTime.Year())*12 + int(currDate.Month()-findDateTime.Month())
 			// 用实际日期的月份作为基准，往前推12个月（2024-5-13 16:26:43修改）
 			tmpN := (currDate.Year()-realDateTime.Year())*12 + int(currDate.Month()-realDateTime.Month())
-			fmt.Println(tmpN)
 			if tmpN <= 0 {
 				continue
 			}