Commit Graph

4081 Commits (9064fc7c584a95396081ed487b8c032767c032ca)

Author SHA1 Message Date
廖金灵 9b6d2a72d9 Merge branch 'fix/member_user_info' of wmtx/platform into release
优化用户列表统计数据
yulingwei cf0762cb9c upt
yulingwei 315ebb2152 upt
chenzhi 71530c53e3 优化公会统计内充详情不符问题
chenzhi 75c934490e 测试 回退
chenzhi b8d4204ef9 ceshi
chenzhi 02d36af96a Merge branch 'feature/add_opertion_log' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
chenzhi d64895896f 优化公会统计默认值
zhengyongxing e31138b5a5 测试白名单bug修改
chenzhi ccda6e0b39 开启操作日志
chenzhi 45cad05508 优化用户列表统计数据
sunke 0c0b2d2f01 record_PromoteLogs热修复
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei 4caa02a76b upt
yulingwei b8fda2417a 工单管理
sunke 31ac6f0a1a 推广后台财务管理退回导出设备版本
sunke 389ef7e967 bug修复
ELF b81842e6e0 解决冲突
zhengyongxing 48239c0f13 测试订单bug修改
ELF 9e82faf6f3 关闭后台操作日志
sunke 098c63d63d 支付渠道优化
zhengyongxing 141bdf561a 支付渠道添加索引
sunke 2ecb05d924 支付渠道统计
zhengyongxing 2ff97a4f41 Merge branch 'feature/user_repeat' into release
zhengyongxing e32be1bb57 测试资源权限去除
zhengyongxing 02b6db4aac Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 71751034b0 Merge branch 'feature/user_repeat' into release
zhengyongxing 458aea9c2a 测试资源bug修正
sunke 3edb0640ed 新增管理后台测试订单导出功能
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
zhengyongxing 3302015365 行为日志增加修改绑定推广员操作
zhengyongxing 4ee6146a49 Merge branch 'feature/user_repeat' into release
zhengyongxing c6eef5124d 测试资源修改
zhengyongxing 7f0c883904 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 11f8434215 Merge branch 'feature/user_repeat' into release
zhengyongxing a2312d9eaa 用户去重bug修改
chenzhi 50b21f45ab Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 7fa400a0a5 优化公会统计统计栏样式
zhengyongxing 443abed206 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 19d85f3717 测试资源可用余额接口修改
chenzhi 8fdcf88825 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi 3cbf6c5a39 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi fac54ad10d 优化绑币收回内存
zhengyongxing 15cd1b51da Merge branch 'feature/user_repeat' into release
zhengyongxing 1a6282c52c 测试资源可用余额接口修改
zhengyongxing caddcd1543 日志管理删除url开启
zhengyongxing 14c3d365e3 Merge branch 'feature/user_repeat' into release
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服
zhengyongxing ffd6238bc1 测试订单bug修正
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证
chenzhi fd7dc828bd Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 650d0c8f69 优化公会统计内外团检索
chenzhi 63314e6ccc Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi a340a74864 优化公会统计游戏统计的内外团统计
chenzhi 9208f78293 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi cc3552b862 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi d0f07315da 操作日志前端检索名词修改
yulingwei 4b195fa3ba Merge branch 'hotfix/fix_bug' into release
万盟天下 a47d41903a Merge branch 'hotfix/fix_bug' of wmtx/platform into master
渠道费率问题
yulingwei 68cee2d381 fix
zhengyongxing 8ef0543b56 游戏统计错位bug提交
zhengyongxing f840a59ce2 日志操作bug修复
sunke 772f6c0a2d 操作日志降序
zhengyongxing a763b96199 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing c1ad1396bc 日志操作bug修复
chenzhi 62c8c1e54d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi a44b8670b0 玩家信息修改操作日志
chenzhi 7d5d6c3b3d 礼包管理-操作日志
zhengyongxing b864934969 行为日志时间筛选修正
chenzhi dd0f930105 游戏预告-操作日志
zhengyongxing 10f2f4b210 行为日志导出错误修改
zhengyongxing 0443871173 用户列表去除重复行
chenzhi c24b5b9e9c 合作方管理-操作日志
chenzhi 79108b7a93 原包管理-操作日志
zhengyongxing 61c2519ccd 单独判断admin
zhengyongxing 67ab1fa89e Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式
zhengyongxing 25954045e9 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 0b8c42379d 游戏导出设备类型修正
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 44f44d0c4a 操作日志函数修改
chenzhi ae34eecb24 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 77dbc94063 游戏类型-操作日志
zhengyongxing 3b73c1d340 操作日志bug修正
万盟天下 52e058ba49 Merge branch 'hotfix/landing-page' of wmtx/platform into master
修改落地页ios注册
万盟天下 bab656e823 Merge branch 'hotfix/log-landing-page' of wmtx/platform into master
落地页useragent记录
zhengyongxing 7f0cc29c78 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release
liuweiwen 1f9a407794 Merge remote-tracking branch 'origin/release' into release
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release
liuweiwen f35c7bdc77 实时充值查询增加易宝支付
zhengyongxing 19cbae833a 操作日志bug修正
zhengyongxing bfe5aeec0a Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 31948abdf4 操作日志bug修正
chenzhi b7d0012d6e 游戏列表-操作日志
zhengyongxing f9be1c2f48 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 498508b7f1 推广结算管理日志添加
zhengyongxing 665b4c8bfa 推广结算管理日志添加
zhengyongxing 9a2ee9d28f 行为日志行为字段bug修改
chenzhi 61a29307f2 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 8bb790cf4e 优化月结导出错误
zhengyongxing ab6e063c9a 推广员管理管理日志添加
chenzhi a9f984d0aa 充值大块-操作日志ok
liuweiwen 10ebbedcbb Merge remote-tracking branch 'origin/release' into release
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release
# Conflicts:
#	Application/Admin/Common/extend.php
liuweiwen 5d596094a6 增加易宝支付
liuweiwen f74cfcc756 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
chenzhi 31c7732002 支付渠道统计-操作日志
ELF 2971f260da Merge branch 'hotfix/landing-page' into release
ELF cd8d6d5a76 调试
zhanglingsheng c6e1493035 易宝支付
chenzhi 71f2453bb4 绑币回收-操作日志
ELF 350fd45b40 Merge branch 'hotfix/log-landing-page' into release
ELF 3ef3e8e819 落地页useragent记录
ELF 02e85ac94c Merge branch 'hotfix/log-landing-page' into release
ELF 0105fafcb3 落地页useragent记录
liuweiwen aa7e6fa0ec 推广公司新增与编辑减少必填项
chenzhi cb696c923f 后台发放(玩家)-操作日志
chenzhi e6fe04a218 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 60edd1f8ca 后台发放(玩家)1-操作日志
zhengyongxing 9cb8fadf39 测试资源管理日志添加
ELF ae29e6ef53 Merge branch 'hotfix/landing-page' into release
ELF 0010ca54f7 修改落地页样式
chenzhi 31a0a174bd 后台发放-操作日志
ELF e55d8021ee Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 7a6b996752 Merge branch 'hotfix/landing-page' into release
ELF 04bbf3534b 修改落地页ios注册
chenzhi 4cd078450c 平台币充值-操作日志
chenzhi 6617fff329 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi f6d991124b 平台币充值-操作日志
liuweiwen c9d69414ba Merge branch 'hotfix/game_recharge_stat' into release
liuweiwen 22aa120ad6 去掉多余的换行
liuweiwen 1a4bf752c4 Merge remote-tracking branch 'origin/release' into release
liuweiwen 9468366a99 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
liuweiwen b081544805 Merge branch 'hotfix/game_recharge_stat' into release
zhengyongxing 0aa1f53a5f 下游结算单管理日志添加
zhanglingsheng 95f93bdc04 配置添加易宝支付
liuweiwen 4a45103650 平台币充值汇总补一列
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
zhengyongxing 5224eec9f2 上游结算单管理日志添加
liuweiwen 9221b18955 游戏统计汇总权限
chenzhi cbd1625ecb Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 6cb25fe7fe 游戏充值-操作日志
sunke 5dd81207cc 日志
sunke cb80f197ff Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_log