Merge branch 'eta/1.8.3' into debug

controllers/report_v2.go

@@ -755,7 +755,7 @@ func (this *ReportController) SaveReportContent() {
 			reportInfo.EndResourceId = req.EndResourceId
 			reportInfo.ModifyTime = time.Now()
 			reportInfo.ContentModifyTime = time.Now()
-			updateCols := []string{"Content", "ContentSub", "HeadImg", "EndImg", "CanvasColor", "HeadResourceId", "EndResourceId", "ModifyTime", "ContentModifyTime"}
+			updateCols := []string{"Content", "ContentSub", "ContentStruct", "HeadImg", "EndImg", "CanvasColor", "HeadResourceId", "EndResourceId", "ModifyTime", "ContentModifyTime"}
 			err = reportInfo.UpdateReport(updateCols)
 			if err != nil {
 				br.Msg = "保存失败"

models/report.go

@@ -85,6 +85,7 @@ type Report struct {
 	ReportLayout        int8      `description:"报告布局，1：常规布局，2：智能布局。默认：1"`
 	IsPublicPublish     int8      `description:"是否公开发布，1：是，2：否"`
 	ReportCreateTime    time.Time `description:"报告时间创建时间"`
+	InheritReportId     int       `description:"待继承的报告ID"`
 }
 
 type ReportList struct {
@@ -145,6 +146,7 @@ type ReportList struct {
 	EndResourceId       int       `description:"版尾资源ID"`
 	ClassifyIdThird     int       `description:"三级分类id"`
 	ClassifyNameThird   string    `description:"三级分类名称"`
+	InheritReportId     int       `description:"待继承的报告ID"`
 }
 
 type ReportListResp struct {

services/report_v2.go

@@ -61,6 +61,7 @@ func AddReportAndChapter(reportInfo *models.Report, inheritReportId int, grantAd
 			reportInfo.NeedSplice = inheritReport.NeedSplice
 			reportInfo.HeadResourceId = inheritReport.HeadResourceId
 			reportInfo.EndResourceId = inheritReport.EndResourceId
+			reportInfo.InheritReportId = inheritReport.Id
 		}
 	}