qy-platform/Public
zhengyongxing 6243ca60cf Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
 Conflicts:
	Application/Admin/Controller/SocietyInfoController.class.php
	Public/static/area.js
..
Admin 公会信息登记信息补充
App initial
Commerce initial
Home 推广后台优化
Media 修改网站注册
Mobile 修改
Open initial
Sdk 支付流程修改
Site initial
error initial
static 工会信息bug修改
favicon.ico initial