Commit Graph

1413 Commits (0571347aeb8e8961cf3e92d8a2f8448552e63fe1)

Author SHA1 Message Date
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
chenxiaojun 49270427ee 推广平台->数据汇总->充值玩家--更新
zhengchanglong c63873c171 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 1ed48003ac 超级签充值BUG修复
sunke bf3f7f70fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
sunke 1e090fc6dd 时间格式
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
sunke 7220083d84 公告
zhengyongxing 66776fef98 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 89b67c06a4 登录sdk,跳转至购买超级签,无需重新登陆
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
sunke a87eca6363 创建时间
sunke 7610314927 数据管理
zhengchanglong d191552c1f Merge branch 'dev_zcl' into dev
zhengchanglong ddacae349e Merge branch 'dev_lww' into dev_zcl
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
“用lww 019ae56f40 手机官网-落地页
zhengyongxing 5c97bb7610 数据分析bug修正
zhengyongxing db40381bb1 定时器接口时间区间修正
sunke 401edecd61 target_level
“用lww 07a33ab051 手机官网-落地页
sunke 5241f98c68 平台币转移
zhengyongxing 4f27c2fb29 统计bug修正
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
sunke dd7a55bf38 账号修改
sunke a770dc14e5 安全中心
sunke e244b43c92 推广员账号
zhengchanglong b432423068 Merge branch 'dev_zcl' into dev
zhengchanglong 28ab1af0b8 Merge branch 'dev-cz' into dev_zcl
chenzhi e9e718abbb 同上
chenzhi 0e72821a89 修改推广后台平台币充值手续费费率
sunke f4bf575663 时间格式
“用lww 28db83f646 Merge remote-tracking branch 'origin/dev' into dev_lww
sunke bfb236892c 提交方式
“用lww 97543cebb8 pc官网-充值页面修改
sunke 5a83adb06d 下载注释
sunke 193631bbb2 大小写问题
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c0f19228d2 修改bug
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新