Commit 585179d9 authored by wangdong1's avatar wangdong1

Merge branch 'master' into 0807_wangdong_apply_amount

parents 6bb5251a cf673e63
...@@ -221,7 +221,7 @@ goods.tcc.cancel_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_ ...@@ -221,7 +221,7 @@ goods.tcc.cancel_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_
;给订单后台用 ;给订单后台用
goods.marketingfororder.marketing_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/marketing_list" goods.marketingfororder.marketing_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
goods.marketingfororder.goods_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/goods_list" goods.marketingfororder.goods_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/goods_list"
goods.marketingfororder.sub_shop_list = "http://goods.int.yidian-inc.com/order/marketing/marketingfororder/take_place_list" goods.marketingfororder.take_place_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
;======================= 5000000-prod order微服务接口 ======================= ;======================= 5000000-prod order微服务接口 =======================
...@@ -555,7 +555,7 @@ goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/ca ...@@ -555,7 +555,7 @@ goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/ca
;给订单后台用 ;给订单后台用
goods.marketingfororder.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/marketing_list" goods.marketingfororder.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
goods.marketingfororder.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/goods_list" goods.marketingfororder.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/goods_list"
goods.marketingfororder.sub_shop_list = "http://goods.test.int.yidian-inc.com/order/marketing/marketingfororder/take_place_list" goods.marketingfororder.take_place_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
;======================= 5000000-test order微服务接口 ======================= ;======================= 5000000-test order微服务接口 =======================
;订单 ;订单
...@@ -851,7 +851,7 @@ goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_ ...@@ -851,7 +851,7 @@ goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_
;给订单后台用 ;给订单后台用
goods.marketingfororder.marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/marketing_list" goods.marketingfororder.marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/marketing_list"
goods.marketingfororder.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/goods_list" goods.marketingfororder.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/goods_list"
goods.marketingfororder.sub_shop_list = "http://goods.dev.yidian-inc.com/order/marketing/marketingfororder/take_place_list" goods.marketingfororder.take_place_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/take_place_list"
;======================= 5000000-dev order微服务接口 ======================= ;======================= 5000000-dev order微服务接口 =======================
;订单 ;订单
......
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