Merge branch 'eta/1.8.3' into debug

# Conflicts:
#	models/ppt_english/ppt_english.go

controllers/report.go

@@ -2222,7 +2222,7 @@ func (this *ReportController) PrePublishReport() {
 	}
 
 	// 生成报告pdf和长图
-	if report.HasChapter != 1 && report.ChapterType != utils.REPORT_TYPE_DAY && report.ChapterType != utils.REPORT_TYPE_WEEK && req.ReportUrl != "" {
+	if req.ReportUrl != "" {
 		go services.Report2pdfAndJpeg(req.ReportUrl, report.Id, 1)
 	}
 

models/ppt_english/ppt_english.go

@@ -49,7 +49,7 @@ type PptEnglishItem struct {
 	IsShare       int8      `description:"是否分享，0：不分享，1：分享"`
 	PublishTime   time.Time `description:"发布时间"`
 	CoverContent  string    `description:"PPT内容-JSON"`
-	PptPage       int       `description:"PPT正文页数"`
+	PptPage       int       `description:"PPT页数"`
 	TitleSetting  string    `description:"PPT标题设置"`
 }