解决冲突

public/assets/wechat/blog_detail.html

@@ -8,7 +8,7 @@
             <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
             <div class="cl"></div>
             <div class="post-content" style="height:auto;">
-                <div class="post-all-content c-grey2 mt10">{{blog.content}}<br /></div>
+                <div class="post-all-content c-grey2 mt10" ng-bind-html="blog.content|safeHtml"></div>
             </div>
             <div class="cl"></div>
             <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>

public/assets/wechat/jour_message_detail.html

@@ -7,7 +7,7 @@
             <div class="post-title hidden">{{message.created_on}}</div>
             <div class="cl"></div>
             <div class="post-content c-grey2 mt10" style="height:auto;">
-                <div class="post-all-content">{{message.notes}}</div>
+                <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
             </div>
             <div class="cl"></div>
         </div>