update:set

11d60a01 · jianghaiming · 4a53c3b0 · 11d60a01
Commit 11d60a01 authored Aug 09, 2021 by jianghaiming
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

interface.ini interface.ini +5 -6

No files found.
--- a/interface.ini
+++ b/interface.ini
@@ -590,14 +590,13 @@ 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_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"

-<<<<<<< HEAD
+
 ;新订单后台
 order.order.op_order_list = "http://order.test.yidian-inc.com/order/order/op_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"
->>>>>>> 3b52a28a6486d14cd28a479e2028afacbc8ffcd5


 ;tcc调order用子项目
@@ -885,15 +884,15 @@ 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_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"

-<<<<<<< HEAD
+ 
 ;新订单后台
 order.order.op_order_list = "http://order.dev.yidian-inc.com/order/order/op_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"
->>>>>>> 3b52a28a6486d14cd28a479e2028afacbc8ffcd5
+ 

 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"