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

bizcode.ini

@@ -4,4 +4,6 @@ merchant=2000000
 interaction=3000000
 goods=4000000
 order=5000000
-pay=6000000
+pay=6000000
\ No newline at end of file
+account=7000000
+wallet=8000000
\ No newline at end of file

email.ini

+[common]
+
+
+[prod-tcc : common ]
+to_email                = api@yidian-inc.com
+
+[dev-tcc : common]
+to_email                = zhangyu1@yidian-inc.com
+
+[test-tcc : common]
+to_email                = zhangyu1@yidian-inc.com
\ No newline at end of file

interface.ini

@@ -133,7 +133,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.int.yidian
 merchant.lifeaccount.get_account_info_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
 merchant.lifeaccount.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "http://merchant.int.yidian-inc.com/lifeaccount/account/update_life_account"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
 interaction.index.follow = "http://interact.int.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index/follow_list"
@@ -223,7 +223,7 @@ merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc
 merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
 merchant.lifeaccount.batch_get_account_name = "merchant.test.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
 interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/index/follow_list"
@@ -357,7 +357,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.dev.yidian
 merchant.lifeaccount.get_account_info_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
 merchant.lifeaccount.batch_get_account_name = "merchant.dev.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
 interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow"