Merge remote-tracking branch 'origin/custom'

# Conflicts:
#	utils/common.go

services/document_manage_service/document_manage_service.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"html"
 )
 
 func DocumentClassifyList(userId int) ([]models.ClassifyVO, error) {
@@ -327,7 +328,7 @@ func DocumentReportDetail(outsideReportId int) (*document_manage_model.OutsideRe
 		Abstract:        outsideReport.Abstract,
 		ClassifyId:      outsideReport.ClassifyId,
 		ClassifyName:    outsideReport.ClassifyName,
-		Content:         outsideReport.Content,
+		Content:         html.UnescapeString(outsideReport.Content),
 		SysUserId:       outsideReport.SysUserId,
 		SysUserName:     outsideReport.SysUserName,
 		CreateTime:      outsideReport.CreateTime,

utils/common.go

@@ -2529,6 +2529,7 @@ func customXssPolicy() (p *bluemonday.Policy) {
 	return
 }
 
+
 // GetCurrentTime 获取当前时间 格式为 2024-08-07 15:29:58
 func GetCurrentTime() string {
 	return time.Now().Format("2006-01-02 15:04:05")