Merge branch 'fix/2023-01-04' into debug

# Conflicts:
#	controller/chart/chart_info.go

controller/chart/chart_info.go

@@ -262,6 +262,7 @@ func GetChartInfoDetail(c *gin.Context) {
 	resp.XEdbIdValue = xEdbIdValue
 	resp.YDataList = yDataList
 	resp.MyChartInfo = myChartInfo
+
 	response.OkData("获取成功", resp, c)
 }
 

services/chart/predict_edb_info.go

@@ -267,10 +267,11 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayLi
 		}
 	case "月度":
 		for currDate := startDate; currDate.Before(endDate) || currDate.Equal(endDate); {
-			currDate = time.Date(currDate.Year(), currDate.Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 2, -1)
+			currDate = time.Date(currDate.Year(), currDate.Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 1, -1)
 			if !currDate.After(endDate) {
 				dayList = append(dayList, currDate)
 			}
+			currDate = currDate.AddDate(0, 0, 1)
 		}
 	}
 	return