Merge branch 'feature/yb11.10_rai_report' into debug

models/response/pc/report.go

@@ -64,6 +64,7 @@ type LatestReport struct {
 	PublishTime        time.Time `description:"发布时间" json:"publish_time"`
 	Stage              int       `description:"期数" json:"stage"`
 	ReportId           int
+	RaiReportId        int
 }
 
 func GetLatestStage(classifyNames []string) (items []*LatestReport, err error) {
@@ -173,6 +174,5 @@ func GetRaiRecommendList(reportId, firstId, secondId, thirdId int, publishTime t
 		}
 		items = append(items, afterItems...)
 	}
-
 	return
 }

models/tables/rddp/report/query.go

@@ -333,7 +333,8 @@ classify_name_second,
 title,
 content_sub,
 stage,
-publish_time 
+publish_time,
+rai_report_id
 FROM
 	report
 WHERE
@@ -360,7 +361,8 @@ classify_name_second,
 title,
 content_sub,
 stage,
-publish_time 
+publish_time,
+rai_report_id
 FROM
 	report AS r
 	INNER JOIN