Merge branch 'colonel' into 'master'

add 营销中心-活动列表

See merge request bp/yaconf!35

interface.ini

@@ -154,6 +154,10 @@ goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_
 goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_wechat_bind"
 goods.public.take_place_by_goods_sku_ids = "http://goods.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
+;营销中心
+goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 
 
 
@@ -571,6 +575,10 @@ goods.marketing.colonel_add_apply_point = "http://goods.test.int.yidian-inc.com/
 goods.marketing.colonel_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/apply"
 goods.marketing.colonel_is_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/is_apply"
 
+;营销中心
+goods.marketing.yingxiao_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.test.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 ;供应商
 goods.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.test.int.yidian-inc.com/goods/ota/list"
@@ -910,6 +918,10 @@ goods.marketing.colonel_add_apply_point = "http://goods.dev.yidian-inc.com/marke
 goods.marketing.colonel_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/apply"
 goods.marketing.colonel_is_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/is_apply"
 
+;营销中心
+goods.marketing.yingxiao_list = "http://goods.dev.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.dev.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 ;供应商
 goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.dev.yidian-inc.com/goods/ota/list"