qy-platform/Application
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
..
Admin Merge branch 'feature/update_payment' into feature/add_item
Api/Controller cp下游接口添加
App 修改网站注册
Base Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Callback
Channel
Commerce
Common Merge branch 'feature/game_select_bug' of wmtx/platform into release
Home 特殊公司评级管理权限
Media 隐藏平台币充值
Mobile 隐藏平台币充值
Open
Payment Merge branch 'feature/update_payment' into feature/add_item
Sdk 优化代码
Site
Ucenter
User 添加手机登录的功能