liuweiwen 7293bf158f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/View/BehaviorLog/index.html
#	Application/Home/Controller/QueryController.class.php
..
Common 推广平台>数据管理>充值玩家--更新
Conf 资料详情落地页增加layui样式
Controller Merge branch 'release-1.0.0' into dev
Event 修改bug
Lang initial
Logic initial
Model 解决冲突
OrderNo 去除vbs代码
SecretKey/alipay initial
View/default 落地页关闭下载提示文字修改
Widget initial