fix conflict

443c93be · yangchenglin · 23e339f3 · 0f606cf4 · 443c93be
Commit 443c93be authored Oct 21, 2019 by yangchenglin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

tag.py api/tag.py +2 -1

No files found.
--- a/api/tag.py
+++ b/api/tag.py
@@ -270,7 +270,8 @@ class TagRelatePictorialInfo(APIView):
        except Exception as e:
            error_logger.error(u'获取画报列表失败%s', e)
            raise
-        return {'data': data}
+
+        return data


 class TagSetListView(APIView):