Commit Graph

1803 Commits (7fa6baf86065ed1c06cd1fa59212e6002420edc9)

Author SHA1 Message Date
chenzhi d7737291ed 暂存1
sunke e7397e38b9 ios
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
yulingwei c40f5dda26 upt
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
sunke 49efb2e60f xiufu
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
zhengyongxing 87b1b04040 充值财务管理金额保留小数点
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release
导出问题修复
yulingwei eca43f471d upt
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源bug修正
zhengyongxing 3b58c877c4 测试资源配置状态添加
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源定时脚本修正
sunke 7194cd49ae 平台币
zhengyongxing 61b5fb48b6 测试资源配置状态添加
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单提示语修改
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
sunke e0d8539ea0 ex
sunke 35f5cc03bb value_detail
sunke e94c64a881 平台币统计
廖金灵 3be1bd78ed Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
yulingwei 26f89f3c64 merge
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
zhengyongxing c3adec70ec ip限制白名单提交
sunke 7da471b6ee 支付时间
yulingwei 8e7dd34b92 upt
yulingwei adf11e2b60 upt
yulingwei fc3b7be03e upt
yulingwei 175502e384 fix
zhengyongxing 5d81a253db ip限制控制器提交
yulingwei b10717e8b6 upt
chenzhi bfee0578d0 玩家列表新增去重数据栏
yulingwei ead4a8598e upt
chenzhi c61f750549 优化新增推广员员时手机号错误问题
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度
zhengyongxing d5561209fd 管理后台日志唯一键值bug修改
zhengyongxing 958fb41227 管理后台日志唯一键值修改
廖金灵 e885a75d1d Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计及公会统计打开速度
chenzhi 381327ae21 优化游戏统计
chenzhi a33bf22e52 优化弹框
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题
chenzhi 27d4e7835d 优化公会统计索引1
廖金灵 9b6d2a72d9 Merge branch 'fix/member_user_info' of wmtx/platform into release
优化用户列表统计数据
yulingwei cf0762cb9c upt
yulingwei 315ebb2152 upt
chenzhi 71530c53e3 优化公会统计内充详情不符问题
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 45cad05508 优化用户列表统计数据
ELF dae2dd5fd9 优化游戏
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei 4caa02a76b upt
yulingwei b8fda2417a 工单管理
sunke 389ef7e967 bug修复
ELF b81842e6e0 解决冲突
sunke 098c63d63d 支付渠道优化
zhengyongxing 141bdf561a 支付渠道添加索引
sunke 2ecb05d924 支付渠道统计
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修改
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
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修复
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 25954045e9 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 0b8c42379d 游戏导出设备类型修正
chenzhi ae34eecb24 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 77dbc94063 游戏类型-操作日志
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release
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 969bf4dc8a Merge branch 'feature/yibao_company' into release
# Conflicts:
#	Application/Admin/Common/extend.php
liuweiwen f74cfcc756 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
chenzhi 31c7732002 支付渠道统计-操作日志
chenzhi 71f2453bb4 绑币回收-操作日志
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 测试资源管理日志添加
chenzhi 31a0a174bd 后台发放-操作日志
chenzhi 4cd078450c 平台币充值-操作日志
chenzhi 6617fff329 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi f6d991124b 平台币充值-操作日志
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
zhengyongxing 0aa1f53a5f 下游结算单管理日志添加
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
zhengyongxing 5224eec9f2 上游结算单管理日志添加
chenzhi cbd1625ecb Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 6cb25fe7fe 游戏充值-操作日志
zhengyongxing 6483047fe4 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 5e794bd785 推广员日志记录添加
chenzhi e129a044d4 操作日志-角色权限
zhengyongxing 3c628fa1c6 统计日志添加
chenzhi 81830703f3 角色权限-操作日志1
chenzhi 3a9575c602 管理员列表增删改导出-操作日志
liuweiwen 1e24fadb79 最低申请额度与最高申请额度不能小于0
chenzhi 40d2c2777f 测试白名单增删改操作日志
zhengyongxing a6a29bf63a 统计日志添加
chenzhi dc171af556 分控新增与解除操作日志
liuweiwen 8e3ee63a44 自动审核规则调整
chenzhi 55fd5d94e8 实名认证,防沉迷
liuweiwen 7d879686af 自动审核规则调整,锁定显示红色字体
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核
chenzhi 0e0a7263e3 操作日志-防刷预警
chenzhi 97ff3baaff 优化操作日志下载
chenzhi 7141e3752e 优化操作日志基函数
chenzhi 148d445f10 用户新增导出操作日志
chenzhi 580eb9dea3 优化移动公共函数后的变化
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中
chenzhi 2de1d9bccb 优化批量操作
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 02407d1c50 优化操作日志函数
zhengyongxing dd478e264f 行为日志按照原型修改完成
zhengyongxing 1aa12fe2d1 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing d2867b4635 行为日志完成
chenzhi bd53d01a0e 用户编辑优化
chenzhi 80f8eb431c 用户编辑结束
chenzhi 6dfb13e4d9 新增操作权限
chenzhi 0d4ca0840b 优化平台币回收内存
liuweiwen ad48df6c91 数据展示权限
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release
zhengyongxing e01bcc236f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
zhengchanglong eecd38e424 Merge branch 'fix/divide_test' into release
liuweiwen 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen c05b10cb87 对账单系统-》未审核不可确认
yulingwei e2851c13f1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release