Commit Graph

620 Commits (d9782182ca7155668d216369a575d2cefffb9ecd)

Author SHA1 Message Date
chenxiaojun 536ee9627f 脚本:用户推广员数据刷新
chenxiaojun 71df93a12f 推广平台->数据管理->充值玩家--更新
chenxiaojun 167e056f9a 脚本:用户推广员数据刷新
chenxiaojun 014a0e2f34 脚本:用户推广员数据刷新
chenxiaojun 73ca6f1f3f 推广平台->数据管理->订单查询--更新
chenxiaojun 83267e230a 推广平台->数据管理->数据管理->订单查询--更新
chenxiaojun 6cce4d7e05 推广平台->数据管理->订单查询--更新
chenxiaojun 1af46a74ee 推广平台->数据管理->数据管理->订单查询--更新
liuweiwen 466153f51a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 16d91ec2ee 后台游戏评分限制
zhengyongxing 2cc68f3086 Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev
 Conflicts:
	Application/Admin/Controller/StatController.class.php
zhengyongxing 245e07fc3f 设备统计脚本bug修正
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev
ELF f3f497a21d Merge branch 'hotfix/oldpack' into dev
yulingwei fa9d40f87a 新增风控标识
liaojinling 3cfce8675e 修改每分钟打包数量
zhengyongxing 57ca1269d6 登录导出优化
zhengyongxing 56d3718c14 用户登录记录
liuweiwen b61587868b 上传广告图片
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常
zhengyongxing 9e26a06ed2 统计bug修正
zhengyongxing e8477373ff 定时脚本bug
liuweiwen 3dddaf247d 后台还原游戏充值导出
liuweiwen b764260647 后台上传官网附件
liuweiwen 790b49c95b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 192ad84897 后台-》平台币充值导出时间
chenzhi 81e56063c7 优化取消补链提示
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 14f69c408e 登录记录导出
chenzhi d64b627883 游戏充值新增文字说明
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错
chenzhi ef25027213 补链新增切分时间
chenzhi f09ee94952 优化补链参数
chenzhi dd22e6d0e9 修改补链in/out
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev
yulingwei 7a767466ef 锁号优化
zhengyongxing 34d424887d 绑定币
zhengyongxing 1881d11d09 绑币收回修改
ELF 5737c714b1 修改
ELF cd060a42a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3d3062dd8c OA
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 728f78db09 OA关联切换正式
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 793c1501ba 修改
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8f36f7204f 优化首页显示
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新