Commit Graph

45 Commits (e5067479d775ff04dcb12570e7511b70b0429f64)

Author SHA1 Message Date
zhengyongxing 24dab9158b 管理后台bug修改
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev
yulingwei fa9d40f87a 新增风控标识
zhengyongxing 56d3718c14 用户登录记录
yulingwei 7a767466ef 锁号优化
zhengyongxing 7d70f856ce 用户玩家列表优化
chenzhi ceb50f20b6 优化用户列表数据
chenzhi 507e579755 用户列表统计
yulingwei d8a59b5670 更新
yulingwei 1966e0a2e8 更新
zhengyongxing ee65c37cb1 用户筛选条件修正
yulingwei b1902e5592 更新
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 466dd6cc93 upt
sunke 1d2ce27736 登陆日志排除下线日志
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
chenzhi 8bb10aea61 [bug]玩家列表累计充值
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12362190e6 upt
chenzhi 86b53d375c [新增]玩家列表汇总统计
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
yulingwei a9f06b1d57 修改批量锁定问题
yulingwei 046beee6be 修改bug
chenxiaojun 2e7ecfa53c 管理后台--更新
elf@home 06486d458c 修改bug
yulingwei 44954031bf upt
yulingwei 0d258c1d8d upt
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev
jbrazz 3f1b2d34c2 upt
jbrazz e57dfd3fae 修改设备号查询
jbrazz f4a46335ca upt
ELF 831456b333 解决冲突
jbrazz a8125bf377 upt
jbrazz 48de85a3c3 upt
jbrazz d4c7727426 upt
jbrazz 459b722c1c upt
jbrazz 736c0fd432 fix
ELF 1920d6ce67 修改bug
ELF 2ffa024c4c initial