Merge branch 'feature/eta_2.6.9' into debug

controllers/report_chapter.go

@@ -832,6 +832,7 @@ func (this *ReportController) GetDayWeekChapter() {
 		ReportChapterItem: *chapterItem,
 		GrandAdminIdList:  chapterGrantIdList,
 		PermissionIdList:  chapterPermissionIdList,
+		FreeReportRatio:   reportInfo.FreeReportRatio,
 	}
 
 	// 获取当前编辑状态

models/report_chapter.go

@@ -94,6 +94,7 @@ type ReportChapterItemResp struct {
 	EndImg           string `description:"报告尾图地址"`
 	HeadStyle        string `description:"版头样式"`
 	EndStyle         string `description:"版尾样式"`
+	FreeReportRatio  string `description:"自由布局页面比例：A4; 16:9; 4:3; 10:7"`
 }
 
 type ReportChapterResp struct {