Merge branch 'cygx_12.8.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -651,6 +651,7 @@ func (this *ReportController) List() {
 		for _, v := range list {
 			if v.Resource == 3 {
 				meetingreviewchaptIds = append(meetingreviewchaptIds, v.Id)
+				v.Content = services.AnnotationHtml(v.Content)
 			}
 		}
 		if len(meetingreviewchaptIds) > 0 {

controllers/tactics.go

@@ -372,6 +372,7 @@ func (this *TacticsController) TacticsTimeLineList() {
 	for _, v := range list {
 		v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
 		v.Resource = 1
+		v.Content = services.AnnotationHtml(v.Content)
 	}
 	if len(list) == 0 {
 		list = make([]*models.CygxTacticsTimeLineResp, 0)