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

interface.ini

@@ -100,6 +100,8 @@ merchant.enterprise.op_business_update = "merchant.test.yidian-inc.com/auth/ente
 
 merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_by_lid"
 
+merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
+
 ;互动项目
 interaction.index.follow = "interaction.test.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list"
@@ -109,6 +111,9 @@ interaction.inner.digg = "interaction.test.yidian-inc.com/follow/index/digg"
 interaction.index.life_detail = "interaction.test.yidian-inc.com/follow/index/life_detail"
 
 
+;门店
+goods.shop.add_shop = "goods.test.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "goods.test.yidian-inc.com/shop/shop/get_shop_list"
 
 
 
@@ -142,6 +147,15 @@ merchant.enterprise.get_account_role_list   = "merchant.dev.yidian-inc.com/auth/
 merchant.enterprise.send_code   = "merchant.dev.yidian-inc.com/auth/verify/send_code"
 merchant.enterprise.check_code   = "merchant.dev.yidian-inc.com/auth/verify/check_code"
 
+
+merchant.enterprise.send_mobile_code   = "merchant.dev.yidian-inc.com/auth/enterprise/send_mobile_code"
+merchant.enterprise.check_mobile_code   = "merchant.dev.yidian-inc.com/auth/enterprise/check_mobile_code"
+merchant.enterprise.change_role   = "merchant.dev.yidian-inc.com/auth/enterprise/change_role"
+merchant.enterprise.delete_life_user   = "merchant.dev.yidian-inc.com/auth/enterprise/delete_life_user"
+
+
+
+
 merchant.recruit.create_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruit.update_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruit.get_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
@@ -174,6 +188,8 @@ merchant.enterprise.op_business_update = "merchant.dev.yidian-inc.com/auth/enter
 
 merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_by_lid"
 
+merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
+
 ;互动项目
 interaction.index.follow = "interaction.dev.yidian-inc.com/follow/index/follow"
 interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list"
@@ -182,6 +198,10 @@ interaction.index.is_follow = "interaction.dev.yidian-inc.com/follow/index/is_fo
 interaction.inner.digg = "interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.index.life_detail = "interaction.dev.yidian-inc.com/follow/index/life_detail"
 
+;门店
+goods.shop.add_shop = "goods.dev.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+