Commit Graph

633 Commits (c4eca18b4ebee9dedf7d2088f0d3a630cc6668e5)

Author SHA1 Message Date
chenzhi 25cb177aea 新增游戏区服开服预告
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev
zhengyongxing ba85fc8c76 游戏充值导出修正
ELF 3e7382542d 打包区分ios新旧包
zhengyongxing 059742043c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liuweiwen 56f2c422aa 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】,(一句话简介)限制字数(最多30字)
liuweiwen 24ce610949 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】,名词更改 — (游戏详情介绍)改为(游戏简介)
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 新增风控标识
zhengyongxing ad8dd94e32 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
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 9abca632ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/Controller/ExportController.class.php
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 14f69c408e 登录记录导出
zhengyongxing fd15fde141 登录记录导出修改
chenzhi d64b627883 游戏充值新增文字说明
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错
chenzhi ef25027213 补链新增切分时间
chenzhi f09ee94952 优化补链参数
chenzhi dd22e6d0e9 修改补链in/out
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev
yulingwei 7a767466ef 锁号优化
zhengyongxing 34d424887d 绑定币
zhengyongxing 1881d11d09 绑币收回修改