Commit aaa2e115 authored by 强海明's avatar 强海明

Merge branch 'jielong' into 'master'

Jielong

See merge request bp/yaconf!19
parents ccb97c3b 7088b537
...@@ -250,6 +250,10 @@ order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/ord ...@@ -250,6 +250,10 @@ order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/ord
order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export" order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list" order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list"
;用户老订单
order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
order.order.old_order_info = "http://order.int.yidian-inc.com/order/order/old_order_info"
;tcc调order用子项目 ;tcc调order用子项目
order.tcc.create_order_try = "http://order.int.yidian-inc.com/tcc/tcc/create_order_try" order.tcc.create_order_try = "http://order.int.yidian-inc.com/tcc/tcc/create_order_try"
...@@ -563,6 +567,10 @@ order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/or ...@@ -563,6 +567,10 @@ order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/or
order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export" order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export"
order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list" order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
;用户老订单
order.order.old_user_order_list = "http://order.test.yidian-inc.com/order/order/old_user_order_list"
order.order.old_order_info = "http://order.test.yidian-inc.com/order/order/old_order_info"
;tcc调order用子项目 ;tcc调order用子项目
order.tcc.create_order_try = "http://order.test.yidian-inc.com/tcc/tcc/create_order_try" order.tcc.create_order_try = "http://order.test.yidian-inc.com/tcc/tcc/create_order_try"
...@@ -838,6 +846,10 @@ order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/ord ...@@ -838,6 +846,10 @@ order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/ord
order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export" order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export"
order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list" order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
;用户老订单
order.order.old_user_order_list = "http://order.dev.yidian-inc.com/order/order/old_user_order_list"
order.order.old_order_info = "http://order.dev.yidian-inc.com/order/order/old_order_info"
;tcc调order用子项目 ;tcc调order用子项目
order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try" order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"
order.tcc.create_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_confirm" order.tcc.create_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_confirm"
......
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