422 Commits (def0b2e3741554166a135e7fbe5681f4d50749c0)

Author SHA1 Message Date
yulingwei b9bc2a7162 更新 5 years ago
zhengyongxing 6fcdfd2f31 用户导出 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
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 4915ebc70c 推广员oa关联 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
zhengyongxing c73ce833f4 用户导出修正 5 years ago
sunke 1d2ce27736 登陆日志排除下线日志 5 years ago
zhengyongxing cc4a071194 用户信息大数据量导出错误 5 years ago
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计 5 years ago
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
“用lww f75188f952 后台导出功能增加内存限制到512M 5 years ago
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计 5 years ago
“用lww e1b93a987b 导出数据过大,配置加大内存限制范围 5 years ago
yulingwei 4071341458 更新 5 years ago
yulingwei 090d1e2f69 更新bug 5 years ago
tpingzhang a0ab440e1a 后台防沉迷配置 5 years ago
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
tpingzhang f9307ee710 后台防沉迷配置 5 years ago
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8bb10aea61 [bug]玩家列表累计充值 5 years ago
tpingzhang 704dd789eb 后台防沉迷配置 5 years ago
tpingzhang da794baa96 配置写到数据库 5 years ago
tpingzhang d176d51c5c 配置写到数据库 5 years ago
elf@home dc6790b404 修改 5 years ago
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录 5 years ago
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 200d9e8667 修改bug 5 years ago
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框 5 years ago
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12362190e6 upt 5 years ago
chenzhi 86b53d375c [新增]玩家列表汇总统计 5 years ago
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing ae18f1fb24 推广员统计修改 5 years ago
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计 5 years ago
zhengyongxing 8e18e8faac 推广员统计官方渠道添加 5 years ago
chenxiaojun 5fcad13fce 根据时间统计玩家充值 5 years ago
chenxiaojun 2123b29479 根据时间统计玩家充值 5 years ago
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题 5 years ago
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 849fd77ac6 优化推广员统计的方法 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新 5 years ago
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei feecf9199d 电子邮箱改为选填 5 years ago
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e2a2a07f03 修改bug 5 years ago
chenzhi 8af46f08c2 优化推广员统计1 5 years ago
zhengchanglong 387be649de Merge branch 'dev-cz' into dev 5 years ago
chenzhi 256545a59a 123 5 years ago
zhengyongxing 5c97bb7610 数据分析bug修正 5 years ago
zhengyongxing db40381bb1 定时器接口时间区间修正 5 years ago
zhengyongxing 4f27c2fb29 统计bug修正 5 years ago
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl 5 years ago
zhengyongxing 08b2ba432a 统计数据修正 5 years ago
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi df03c05651 修正统计bug 5 years ago
zhengyongxing 118f706440 脚本去除部分输出 5 years ago
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
5 years ago
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
5 years ago
chenzhi 2a417c2746 123 5 years ago
ELF 2254610041 修改bug 5 years ago
zhanglingsheng fb85d32c87 合并分支 5 years ago