Skip to content

S
sun
Commit 36ac1f8c authored by 杨成林's avatar 杨成林
Browse files
Options

Merge branch 'ycl/fix_dev' into 'dev' 

fix

See merge request alpha/sun!241
parents 637e6419 b5d88e9f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
api/urls.py
View file @ 36ac1f8c
......@@ -192,10 +192,10 @@ urlpatterns = [
url(r'^activity/create$', ActivityCreateView.as_view()),
url(r'^activity/update$', ActivityUpdateView.as_view()),
url(r'^activity/delete$', ActivityDeleteView.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/online', 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/online$', PictorialActivityView.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