Merge branch 'xujunpeng/hotfix/fix_1' into 'dev'

恢复误删代码

See merge request !52

api/topic.py

@@ -124,7 +124,7 @@ class TopicListBatchUpdate(APIView):
         updates = self.handle_filter(request.POST.get('updates', "{}"))
         extra = json.loads(request.POST.get('extra', '{}'))
         try:
-            self.rpc['venus/sun/topic/batch/update'](updates=updates, ids=ids).unwrap()
+            self.rpc['venus/sun/topic/batch/update'](updates=updates, ids=ids, extra=extra).unwrap()
         except Exception as e:
             error_logger.error(u'批量更新帖子失败%s', e)
             raise

requirements.txt

@@ -12,4 +12,4 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.7.8
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-dataquery.git@v0.2.10
 git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
-git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@dev
\ No newline at end of file
+git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@master