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
..
Common 消除打印信息
Conf 修改
Controller Merge branch 'feature/update_payment' into feature/add_item
Event 推广员-数据管理-实时充值 优化打开速度
Lang
Logic
Model 优化是否结算参数
View Merge branch 'feature/update_payment' into feature/add_item
Widget 修改bug