610 Commits (a9a6b4914839564cfee041e184713bb5b82280ea)

Author SHA1 Message Date
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengyongxing 5a80070b97 推广后台导出修改 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
chenzhi 63c27e62ca 123 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
chenzhi 9e171f2ce2 优化统计 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
chenzhi e27cdc8a38 优化所有统计 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
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
yulingwei 38680ddb05 更新 5 years ago
zhengyongxing 1626123074 数据统计7日平均时长修正 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化 5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
chenzhi a6f52ccdb8 优化注册管理员提示信息 5 years ago
chenzhi 360cf3f3ba 优化前端展示 5 years ago
chenzhi 04c5f17790 优化脚本 5 years ago
chenzhi 37d8f72c6d 优化首页展示 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
chenzhi e1739209e3 1 5 years ago
chenzhi 521a343fc3 123 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 94cc0bacbf SDK菜单链接修改 5 years ago
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2e0a8d2ad0 更新统计数据 5 years ago
zhanglingsheng 3453de757f sdk菜单配置修改 5 years ago
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei a7f6d8b7a4 upt 5 years ago
elf@home 06486d458c 修改bug 5 years ago
elf@home 1036589f3b 修改代码 5 years ago
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化 5 years ago
chenxiaojun 83e8427c8b cs 5 years ago
ELF 1c11622eb2 修改bug 5 years ago
ELF b0b0056c43 修改bug 5 years ago
ELF e942f378c6 修改bug 5 years ago
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng fb0808445f 悬浮球加类型 5 years ago
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传 5 years ago
yulingwei 44954031bf upt 5 years ago
yulingwei 0d258c1d8d upt 5 years ago
ELF e2d75ec2c6 修改推广后台首页 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF 784de48bf9 修改bug 5 years ago
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF afb6de56f8 添加3级变四级脚本 5 years ago
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新 5 years ago
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev 5 years ago
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 3f1b2d34c2 upt 5 years ago
zyx 68e57ab1f5 导出链路问题修正 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
ELF f03fec9e43 Merge branch 'feature/promote' into dev 5 years ago
jbrazz e57dfd3fae 修改设备号查询 5 years ago
jbrazz f4a46335ca upt 5 years ago
jbrazz 7396e69a61 upt 5 years ago
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 52880f1a91 upt 5 years ago
zyx ce008b284e 月结统计bug修正 5 years ago
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 679acf6cf1 修改分包 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
chenzhi 7e37f3a2df 优化迁移用户addshifttask 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 2dd1372b78 upt 5 years ago
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5f673b346d 月结统计添加部长渠道 5 years ago
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote 5 years ago
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi a653b46f0e 优化月份统计接口新增事务 5 years ago
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c2e686c38e 123 5 years ago
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 9d09fa4665 4角色聚合 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 9e9d742275 导出添加引号 5 years ago
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev 5 years ago
zyx d5a90238ec 导出加大默认内存 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev 5 years ago
zyx 35e1b2631a 导出添加游戏订单号 5 years ago
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev 5 years ago
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 5 years ago
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev 5 years ago