Merge branch 'test' into 'highlight_topic'

# Conflicts:
#   search/utils/topic.py
#   search/views/topic.py

search/utils/topic.py

@@ -442,6 +442,7 @@ class TopicUtils(object):
                         }
                     }
                 ]
+                q["highlight"] = ESPerform.get_highlight(["content"])
 
                 ##添加高亮展示
                 q["highlight"] = ESPerform.get_highlight(["content"])