Merge branch 'master' of https://git.yidian-inc.com:8021/bp/yaconf

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"
+
 
 
 
@@ -572,6 +576,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"
@@ -912,6 +920,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"

wallet.ini

@@ -8,7 +8,7 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 500;
+withdraw.withdraw_apply_amount = 10;
 ;关闭提现 0 打开 1 关闭
 withdraw.is_closed = 0;
 ;白名单用户