27 Commits (1c8f0d446454666560e337e806b0edfb3a8749bc)

Author SHA1 Message Date
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj 5 years ago
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 09ba38fc79 超级签统计 5 years ago
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenzhi ff04347526 公会统计1 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
ELF 2ffa024c4c initial 5 years ago