Skip to content

Y
yaconf
Commit 6a5de761 authored by suntengda's avatar suntengda
Browse files
Options

Merge remote-tracking branch 'origin/jielong' into jielong 

# Conflicts:
#	interface.ini
parents 2a45011c 16dfaee6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
interface.ini
View file @ 6a5de761
......@@ -722,7 +722,6 @@ goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketin
goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
;团长
goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
goods.marketing.apply_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/apply_distributor"
......
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