Commit Graph

1745 Commits (8b718c47c5f130ba0293955d8fb8d655a815af66)

Author SHA1 Message Date
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复
zhengchanglong d661c3154a Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 6d9abcc574 平台币充值费率修改
chenzhi 3cde3f0a12 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题
zhengyongxing 5a80070b97 推广后台导出修改
chenzhi 3500cce032 [bug]角色查询 区服不显示
chenzhi 9e0f9990d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi bb09ef9005 [bug]角色查询区服不显示
zhengyongxing 2ae543ad7e 用户导出修改
zhanglingsheng 3e8cfab9d0 OA-关联-导出
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ceb50f20b6 优化用户列表数据
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng de3f6196e6 oa关联
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 507e579755 用户列表统计
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 086c95b826 用户导出修改
yulingwei 501ed6c494 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei d8a59b5670 更新
sunke ebfd596a4d 订单初始化时间
sunke f0d28e81c4 导出数据
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新
yulingwei c3955dceb8 更新脚本
yulingwei d95540c92c 登录日志修复脚本
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 3ee50bcfc0 upt
ELF 390f22894a 修改运维脚本
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 80b7142317 修改运维脚本
sunke b1e14f14f1 订单查询导出优化
yulingwei 7c3a3bc0c6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2ab47c0864 充值方式修改
sunke ccfcd2c7a3 backSuccessExport
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ce21545360 oa-关联
yulingwei c03fee5af6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12fb156306 优化脚本
sunke 5b53fb6287 exit
yulingwei be33c5c471 更新
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei bcc0b964b0 upt
zhanglingsheng e9e66fa8a0 oa关联
zhanglingsheng 0a9efe02ca oa关联
elf@home 8d6c547468 支持分片文件上传
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4590988f95 oa
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei b9bc2a7162 更新
zhengyongxing 6fcdfd2f31 用户导出
zhengyongxing d45000e3cd Merge remote-tracking branch 'origin/dev' into dev
zhengyongxing 777352f1bf 平台币充值bug
sunke 96bf61ada0 冲值玩家promoteid
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 1966e0a2e8 更新
zhengyongxing fc126c0bbf 平台币充值bug
zhengyongxing d6b50146ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 945250b01a Merge remote-tracking branch 'origin/dev' into dev
zhengyongxing fb6177d187 平台币充值bug
chenxiaojun e49bce3deb Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun b27e7e3854 更新
sunke 02ea000f2a charge
chenxiaojun ee095e3068 推广平台->游戏管理->充值玩家--调整
zhengchanglong 965ad46dce 充值汇总导出BUG修复
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 7a873a9d98 平台币发放bug修正
zhanglingsheng 668e4d097c 推广员oa关联
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4915ebc70c 推广员oa关联
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei ee7bb128c0 修复
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng dcd9791f79 推广员oa关联
zhengyongxing ee65c37cb1 用户筛选条件修正
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng e59352edbf 推广员oa关联
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整
自动脚本->玩家角色充值数据统计--调整
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 988bf99086 ss
zhengyongxing 6e151dd8a4 用户导出修改
sunke b305069da9 游戏选择
zhengyongxing 30b5e6ed46 用户玩家列表导出优化
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng c4e2d0a245 推广员OA关联
yulingwei 9a3bb4e170 修复排序问题
yulingwei b1902e5592 更新
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 466dd6cc93 upt
zhengyongxing c73ce833f4 用户导出修正
chenxiaojun d6a2e7d120 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun e6210336c8 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun 840dc085a4 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun 5d5c2a68c6 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun bad1165ffa 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun 9374e66840 推广平台->游戏管理->游戏详情--样式调整
sunke 1d2ce27736 登陆日志排除下线日志
sunke 0879762b70 平台注释
sunke 8d7640d152 充值平台
chenxiaojun 930a2dc62f 推广平台-数据管理->角色查询|充值玩家|团队/推广员业绩--检索更新
chenxiaojun 585057f98e 推广平台-数据管理->角色查询|充值玩家|团队/推广员业绩--检索更新
zhengyongxing cc4a071194 用户信息大数据量导出错误
chenxiaojun ff77638001 推广平台->管理中心->编辑--样式调整
chenxiaojun 3cfe2c163d 推广平台->管理中心->编辑--样式调整
chenxiaojun 5c264a7e08 推广平台->管理中心->编辑--样式调整
chenxiaojun e35ada1a5d 推广平台->管理中心->编辑--样式调整
chenzhi b52113622d [bug]无法获取上线推广员问题
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev
“用lww f75188f952 后台导出功能增加内存限制到512M
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计
“用lww e1b93a987b 导出数据过大,配置加大内存限制范围
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
tpingzhang a0ab440e1a 后台防沉迷配置
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang f9307ee710 后台防沉迷配置
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8bb10aea61 [bug]玩家列表累计充值
tpingzhang a77b6d8f04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 704dd789eb 后台防沉迷配置
sunke 3cb2f2b479 arpu名词说明
tpingzhang da794baa96 配置写到数据库
tpingzhang d176d51c5c 配置写到数据库
elf@home dc6790b404 修改
sunke 2437d613bb bug
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 342ec9130e 修改
sunke 08707939d5 表格字段顺序问题
ELF 4cfa9c387f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF ef6b83c867 修改bug
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
ELF 6696889ecb 修改bug
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 200d9e8667 修改bug
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
zhengchanglong c6e6f1e713 Merge branch 'dev_lww' into dev