Commit Graph

4093 Commits (beae17d5188b071044f39bd9c50c18e78c29c9c4)

Author SHA1 Message Date
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke fd815ef5a6 html平台币
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
廖金灵 eb9f84c5dd Merge branch 'feature/IOSdata' of wmtx/platform into release
ios下载量数据统计
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
廖金灵 4ee8b21cd5 Merge branch 'feature/mark_repeat_user' of wmtx/platform into release
用户重复标识-注册事件通知
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
sunke 3bdfbf8c0b ios下载量数据统计
zhengyongxing e7aa7885e8 ip限制白名单提示语修改
zhengyongxing 1d27db663a ip限制白名单提示语修改
zhengyongxing 5f815370e8 ip限制白名单提交
zhengyongxing c3adec70ec ip限制白名单提交
sunke 41f6797e97 表格样式
sunke 7da471b6ee 支付时间
yulingwei 8e7dd34b92 upt
yulingwei 4afce87caa upt
yulingwei b56ba0b882 upt
yulingwei 823062c0f6 upt
yulingwei adf11e2b60 upt
yulingwei fc3b7be03e upt
ELF 6112d6d00c 修改样式
yulingwei 175502e384 fix
zhengyongxing 5d81a253db ip限制控制器提交
yulingwei b10717e8b6 upt
ELF d6a30964b1 修改落地页
chenzhi bfee0578d0 玩家列表新增去重数据栏
ELF bda92e4e1a 用户重复标识-注册事件通知
yulingwei 18b0c3024d upt
yulingwei ead4a8598e upt
yulingwei d9c338acd8 upt
ELF a06b199068 落地页记录下载日志
chenzhi c61f750549 优化新增推广员员时手机号错误问题
ELF b434d2eacc 优化游戏管理
廖金灵 82bd30c4d4 Merge branch 'hotfix/guanwang_beian' of wmtx/platform into release
新增备案跳转
chenzhi 3c8289f382 优化链接打开方式
chenzhi 9ff62b1648 新增备案跳转
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度
廖金灵 5f6bc934a9 Merge branch 'hotfix/apply_game' of wmtx/platform into release
修改添加下級游戲無法顯示推廣員bug
ELF c4b03c2a7d 修改添加下級游戲無法顯示推廣員bug
zhengyongxing d5561209fd 管理后台日志唯一键值bug修改
zhengyongxing 958fb41227 管理后台日志唯一键值修改
廖金灵 e885a75d1d Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计及公会统计打开速度
chenzhi 381327ae21 优化游戏统计
chenzhi a33bf22e52 优化弹框
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题
chenzhi 76cd530239 优化获取子渠道基函数
chenzhi 27d4e7835d 优化公会统计索引1
廖金灵 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 优化用户列表统计数据
ELF dae2dd5fd9 优化游戏
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