Skip to content

S
sun
Commit 8002e667 authored by 杨成林's avatar 杨成林
Browse files
Options

Merge branch 'ycl/fix' into 'test' 

fix

See merge request alpha/sun!277
parents dfbd50df 8a771c68
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
api/activity.py
View file @ 8002e667
...@@ -124,7 +124,7 @@ class PictorialActivityView(APIView): ...@@ -124,7 +124,7 @@ class PictorialActivityView(APIView):
return data return data
class PictorialActivityOlineView(APIView): class PictorialActivityOnlineView(APIView):
def post(self, request): def post(self, request):
......
api/urls.py
View file @ 8002e667
...@@ -193,7 +193,7 @@ urlpatterns = [ ...@@ -193,7 +193,7 @@ urlpatterns = [
url(r'^activity/pictorial$', PictorialActivityView.as_view()), url(r'^activity/pictorial$', PictorialActivityView.as_view()),
url(r'^activity/pictorial$', PictorialActivityView.as_view()), url(r'^activity/pictorial$', PictorialActivityView.as_view()),
url(r'^activity/pictorial/list$', PictorialActivityListView.as_view()), url(r'^activity/pictorial/list$', PictorialActivityListView.as_view()),
url(r'^activity/pictorial/online$', PictorialActivityOlineView.as_view()), url(r'^activity/pictorial/online$', PictorialActivityOnlineView.as_view()),
# 品牌 # 品牌
url(r'^brand/list$', BrandListView.as_view()), url(r'^brand/list$', BrandListView.as_view()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment