Commit Graph

3658 Commits (a67ffa18d6a2dcdcf9282b1b64168c9697703076)
 

Author SHA1 Message Date
ELF 3246745e58 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF c72888181b Merge branch 'dev' into release-1.0.0
zhanglingsheng 6ab69f8b29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng eabf59d3e3 超级签统计
ELF 5e0c1c0f87 修改
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 4e3206a5c1 支付渠道统计bug修正
zhanglingsheng a2062684af Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 1c2bb7e584 超级签统计
chenxiaojun 0bc657a5fc 充值玩家--更新
chenxiaojun 40da308a08 充值玩家--更新
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ae2b498e45 超级签统计
chenxiaojun cc83e0e585 充值玩家--更新
chenxiaojun d3a4933b5c 充值玩家--更新
chenxiaojun ee6c6e62b2 充值玩家--更新
ELF 1a8d66e2d7 Merge branch 'dev' into release-1.0.0
ELF cb63520de5 修改落地页
ELF a8643d20a0 Merge branch 'dev' into release-1.0.0
ELF db46d4b079 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 600d1a27f5 修改
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变
chenxiaojun f8b29d9d12 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenxiaojun 6f99d0a6b6 充值玩家--更新
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenxiaojun 5cf9ad9fd1 充值玩家--更新
zhanglingsheng 9b65fbaabb 超级签统计
chenxiaojun 31e045bdba 充值玩家--更新
chenzhi a61e0f36b5 优化注册统计今日本周本月不变
chenxiaojun a15440e299 充值玩家--更新
chenxiaojun e3742a9d8a 充值玩家--更新
zhanglingsheng befc2ef62b 超级签统计
zhanglingsheng 244e036a21 超级签统计
zhanglingsheng 153c397cf6 超级签统计
ELF a167c51582 Merge branch 'dev' into release-1.0.0
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev
yulingwei 65ed103d3a 修复beta链接格式
liuweiwen 2e5f6b7254 Merge branch 'release-1.0.0' into dev
liuweiwen 4c327a679a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
# Conflicts:
#	Application/Admin/Controller/ExportController.class.php
#	Application/Admin/Controller/PlatformController.class.php
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
ELF b1844a0082 修改落地页
zhengyongxing b0899f3fc9 支付渠道统计bug修正,官网与推广后台充值计入平台币
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 7ba7de46a3 游戏--添加支付方式渠道配置
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置