Merge branch 'haow/dev' into 'test'

fix code user list

See merge request alpha/sun!136

api/user.py

@@ -21,7 +21,7 @@ class UserListView(APIView):
         pictorial_id = request.GET.get('pictorial_id', '')
         page = int(request.GET.get('page', 1))
         limit = int(request.GET.get('limit', 10))
-        filter = self.handle_filter(request.GET.get('filter', ""))
+        filter = self.handle_filter(request.GET.get('filter', '{}'))
         if pictorial_id:
             filter.update({'pictorial_id': pictorial_id})
         try: