Merge branch 'haow/dev' into 'dev'

fix code

See merge request alpha/sun!205

api/activity.py

@@ -9,8 +9,9 @@ class ActivityListView(APIView):
         offset, count = get_offset_count(request)
         name = request.GET.get('name', None)
         is_online = request.GET.get('is_online', None)
+        sort_by = request.GET.get('sort_by', None)
 
-        data = self.rpc['venus/sun/activity/list'](offset=offset, count=count, name=name, is_online=is_online).unwrap()
+        data = self.rpc['venus/sun/activity/list'](offset=offset, count=count, name=name, is_online=is_online, sort_by=sort_by).unwrap()
         return data
 
 

api/word_parent.py

@@ -50,11 +50,12 @@ class WordParentUpdateView(APIView):
         content_ad = request.POST.get('content_ad', None)
         makeup_ad = request.POST.get('makeup_ad', None)
         dress_ad = request.POST.get('dress_ad', None)
+        gender = request.POST.get('gender', None)
 
         if not id_:
             return r'缺少参数'
 
-        data = self.rpc['venus/sun/word_parent/edit'](id_=id_, name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad).unwrap()
+        data = self.rpc['venus/sun/word_parent/edit'](id_=id_, name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad, gender=gender).unwrap()
         if not data:
             return r'更新失败'