Skip to content

S
sun
Commit 9a9c432e authored by 杨成林's avatar 杨成林
Browse files
Options

Merge branch 'ycl/fix' into 'test' 

fix

See merge request !265
parents 771b1832 94b99070
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
api/urls.py
View file @ 9a9c432e
......@@ -195,7 +195,7 @@ urlpatterns = [
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/online$', PictorialActivityView.as_view()),
url(r'^activity/pictorial/online$', PictorialActivityOlineView.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