Merge branch 'feature/crm5.1_english_policy_report' of xyxie/hongze_yb_en_api into master

controller/english_report/english_report.go

@@ -327,6 +327,7 @@ func (er *EnglishReportController) Detail(c *gin.Context) {
 		ReportCode:         reportItem.ReportCode,
 		CreateTime:         utils.TimeTransferString(utils.FormatDateTime, reportItem.CreateTime),
 		ModifyTime:         utils.TimeTransferString(utils.FormatDateTime, reportItem.ModifyTime),
+		KeyTakeaways:       reportItem.KeyTakeaways,
 	}
 	baseData := new(english_report.ReportDetailResp)
 	baseData.Report = reportDetail

models/english_report/report.go

@@ -7,7 +7,7 @@ import (
 )
 
 type Report struct {
-	Id                 uint       `gorm:"primaryKey;column:id" json:"id"`
+	Id                 uint      `gorm:"primaryKey;column:id" json:"id"`
 	AddType            int8      `gorm:"column:add_type" json:"add_type"`                         //新增方式：1:新增报告，2:继承报告
 	ClassifyIdFirst    int       `gorm:"column:classify_id_first" json:"classify_id_first"`       //一级分类id
 	ClassifyNameFirst  string    `gorm:"column:classify_name_first" json:"classify_name_first"`   //一级分类名称
@@ -30,9 +30,10 @@ type Report struct {
 	ReportCode         string    `gorm:"column:report_code" json:"report_code"`                   //报告唯一编码
 	VideoSize          string    `gorm:"column:video_size" json:"video_size"`                     //音频文件大小，单位M
 	Pv                 int       `gorm:"column:pv" json:"pv"`
-	ShareUrl           string    `gorm:"column:share_url" json:"share_url"`     //分享url
-	PvEmail            uint      `gorm:"column:pv_email" json:"pv_email"`       //分享邮箱的PV
-	EmailState         uint8     `gorm:"column:email_state" json:"email_state"` //是否已群发邮件：0-否; 1-是
+	ShareUrl           string    `gorm:"column:share_url" json:"share_url"`         //分享url
+	PvEmail            uint      `gorm:"column:pv_email" json:"pv_email"`           //分享邮箱的PV
+	EmailState         uint8     `gorm:"column:email_state" json:"email_state"`     //是否已群发邮件：0-否; 1-是
+	KeyTakeaways       string    `gorm:"column:key_takeaways" json:"key_takeaways"` //关键点
 	base.TimeBase
 }
 
@@ -104,6 +105,7 @@ type ReportDetail struct {
 	ModifyTime         string `json:"modify_time"`          //最后更新时间
 	Overview           string `json:"overview"`             //概述
 	VideoSize          string `json:"video_size"`           //音频文件大小，单位M
+	KeyTakeaways       string `json:"key_takeaways"`        //关键点
 }
 
 type ReportDetailResp struct {