Merge branch 'master' into 'test'

modify

See merge request !295

search/views/tag.py

@@ -118,6 +118,7 @@ def choice_push_tag(device_id, user_id):
                 redis_push_tag_dict.popitem(tag_id)
 
         redis_push_tag_list = list(redis_push_tag_dict.keys())
+        redis_push_tag_list = [int(item) for item in redis_push_tag_list]
         account_user_tag_list = list(AccountUserTag.objects.filter(user=user_id,is_deleted=False).values_list("tag_id",flat=True))
         community_tag_follow_list = list(CommunityTagFollow.objects.filter(user_id=user_id,is_online=True,is_deleted=False).values_list("tag_id",flat=True))