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

controllers/yanxuan_special.go

@@ -73,7 +73,7 @@ func (this *YanxuanSpecialController) List() {
 		if err != nil {
 			return
 		}
-
+		v.Content = services.AnnotationHtml(v.Content)
 		if v.DocUrl != "" {
 			var docs []models.Doc
 			err := json.Unmarshal([]byte(v.DocUrl), &docs)