Merge branch 'feature/eta_2.6.9' into debug

services/smart_report.go

@@ -368,8 +368,8 @@ func Report2pdfAndJpeg(reportUrl string, reportId, reportType int) {
 			}
 		}
 
-		// 7/10为A4的比例，不需要重新算
-		if freeRatio != "" && freeRatio != "7/10" {
+		// 重新计算比例
+		if freeRatio != "" {
 			h, e := calculateReportPdfHeight(pcWidth, freeRatio)
 			if e != nil {
 				err = fmt.Errorf("重新计算PDF生成高度失败, %v", e)