715 Commits (12fd7ac4e9ac0126e4b3fed6103b49e63c55ceba)

Author SHA1 Message Date
zhengyongxing 245e07fc3f 设备统计脚本bug修正 5 years ago
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev 5 years ago
ELF f3f497a21d Merge branch 'hotfix/oldpack' into dev 5 years ago
yulingwei fa9d40f87a 新增风控标识 5 years ago
zhengyongxing ad8dd94e32 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
liaojinling 3cfce8675e 修改每分钟打包数量 5 years ago
zhengyongxing 57ca1269d6 登录导出优化 5 years ago
zhengyongxing 56d3718c14 用户登录记录 5 years ago
liuweiwen b61587868b 上传广告图片 5 years ago
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常 5 years ago
zhengyongxing 9e26a06ed2 统计bug修正 5 years ago
zhengyongxing e8477373ff 定时脚本bug 5 years ago
liuweiwen 3dddaf247d 后台还原游戏充值导出 5 years ago
liuweiwen b764260647 后台上传官网附件 5 years ago
liuweiwen 790b49c95b Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 192ad84897 后台-》平台币充值导出时间 5 years ago
chenzhi 81e56063c7 优化取消补链提示 5 years ago
zhengyongxing 9abca632ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/Controller/ExportController.class.php
5 years ago
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 14f69c408e 登录记录导出 5 years ago
zhengyongxing fd15fde141 登录记录导出修改 5 years ago
chenzhi d64b627883 游戏充值新增文字说明 5 years ago
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错 5 years ago
chenzhi ef25027213 补链新增切分时间 5 years ago
chenzhi f09ee94952 优化补链参数 5 years ago
chenzhi dd22e6d0e9 修改补链in/out 5 years ago
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev 5 years ago
yulingwei 7a767466ef 锁号优化 5 years ago
zhengyongxing 34d424887d 绑定币 5 years ago
zhengyongxing 1881d11d09 绑币收回修改 5 years ago
ELF 5737c714b1 修改 5 years ago
ELF cd060a42a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3d3062dd8c OA 5 years ago
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 728f78db09 OA关联切换正式 5 years ago
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 793c1501ba 修改 5 years ago
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8f36f7204f 优化首页显示 5 years ago
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新 5 years ago
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新 5 years ago
zhengyongxing 1caece3034 充值汇总修改,用户导出修改 5 years ago
chenzhi af593e4326 优化首页折线统计统计方式 5 years ago
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
zhanglingsheng ede4cdd96e 短信配置 5 years ago
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3f8168c11a 添加新短信 5 years ago
yulingwei 0965c480a3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei e8ed8f808b 修改修复脚本 5 years ago
zhengyongxing 7d70f856ce 用户玩家列表优化 5 years ago
chenzhi 8a7c6219ca 新需求 充值-游戏充值新增两个字段显示 5 years ago
zhanglingsheng 864e2e5de1 OA 5 years ago
zhanglingsheng 473fd31be1 OA 5 years ago
zhanglingsheng 86f05872d2 OA 5 years ago
yulingwei 82556627f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 4e56f9e325 更新 5 years ago
zhanglingsheng a900e5ed66 OA关联 5 years ago
chenzhi 4f1bd88dc2 取消首页速度测试 5 years ago
ELF b720644b02 修改 5 years ago
ELF b08c7748c9 调试 5 years ago
ELF d1833dc406 调试 5 years ago
chenzhi b610845d20 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 4af962e5a6 首页测试 5 years ago
zhengyongxing 6dee3f5939 平台币统计导出 5 years ago
zhengyongxing 93043b3abe 平台统计导出 5 years ago
zhengyongxing 96df83ebfb Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改 5 years ago
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取 5 years ago
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengyongxing 4e78370f14 推广员充值统计 5 years ago
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复 5 years ago
chenzhi 3cde3f0a12 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题 5 years ago
zhengyongxing 5a80070b97 推广后台导出修改 5 years ago
chenzhi 3500cce032 [bug]角色查询 区服不显示 5 years ago
chenzhi 9e0f9990d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi bb09ef9005 [bug]角色查询区服不显示 5 years ago
zhengyongxing 2ae543ad7e 用户导出修改 5 years ago
zhanglingsheng 3e8cfab9d0 OA-关联-导出 5 years ago
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ceb50f20b6 优化用户列表数据 5 years ago
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng de3f6196e6 oa关联 5 years ago
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 507e579755 用户列表统计 5 years ago
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新 5 years ago
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新 5 years ago
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 086c95b826 用户导出修改 5 years ago
zhengyongxing 8f1d59aa39 平台币充值bug 5 years ago
yulingwei d8a59b5670 更新 5 years ago
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新 5 years ago
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新 5 years ago
yulingwei c3955dceb8 更新脚本 5 years ago
yulingwei d95540c92c 登录日志修复脚本 5 years ago
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 3ee50bcfc0 upt 5 years ago
ELF 390f22894a 修改运维脚本 5 years ago
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 80b7142317 修改运维脚本 5 years ago
yulingwei 7c3a3bc0c6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2ab47c0864 充值方式修改 5 years ago
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ce21545360 oa-关联 5 years ago
yulingwei 12fb156306 优化脚本 5 years ago
yulingwei be33c5c471 更新 5 years ago
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei bcc0b964b0 upt 5 years ago
zhanglingsheng e9e66fa8a0 oa关联 5 years ago
zhanglingsheng 0a9efe02ca oa关联 5 years ago
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4590988f95 oa 5 years ago
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei b9bc2a7162 更新 5 years ago
zhengyongxing 6fcdfd2f31 用户导出 5 years ago
zhengyongxing d45000e3cd Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengyongxing 777352f1bf 平台币充值bug 5 years ago
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 1966e0a2e8 更新 5 years ago
zhengyongxing fc126c0bbf 平台币充值bug 5 years ago
zhengyongxing d6b50146ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing fb6177d187 平台币充值bug 5 years ago
zhengchanglong 965ad46dce 充值汇总导出BUG修复 5 years ago
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 7a873a9d98 平台币发放bug修正 5 years ago
zhanglingsheng 668e4d097c 推广员oa关联 5 years ago
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4915ebc70c 推广员oa关联 5 years ago
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei ee7bb128c0 修复 5 years ago
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng dcd9791f79 推广员oa关联 5 years ago
zhengyongxing ee65c37cb1 用户筛选条件修正 5 years ago
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整 5 years ago
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整
自动脚本->玩家角色充值数据统计--调整
5 years ago
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhengyongxing 6e151dd8a4 用户导出修改 5 years ago
zhengyongxing 30b5e6ed46 用户玩家列表导出优化 5 years ago
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
yulingwei 9a3bb4e170 修复排序问题 5 years ago
yulingwei b1902e5592 更新 5 years ago
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 466dd6cc93 upt 5 years ago