Commit Graph

77 Commits (6e1a76872193e56bd776ab46c543b4ae6f78f371)

Author SHA1 Message Date
ELF 6e1a768721 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e4f1ed99f8 修改后台登录页
Your Name 6cb3a9ad75 SDK菜单
Your Name c1a9c3918e SDK菜单
ELF 6df44afb16 功能隐藏
ELF 437909d53a 测试
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序
zyx 7ead67f8cb 快捷图标代码修正
zyx c6da6fb705 首页用户注册充值信息修正
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
chenzhi 2f124bffbb coin_num
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段
zyx 0a9dbe6a78 管理后台菜单bug修复
zyx 2a52aa42ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ba6fc9634b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx c8f101f40c 管理后台添加测试资源
zhengchanglong 6154654a35 SDK登录BUG修复
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
Your Name 22e7866644 SDK菜单添加
Your Name f1b5a2257d SDK用户菜单-修改
Your Name b253d23ae3 SDK用户菜单字段名修改
Your Name 971906dd29 SDK用户菜单
Your Name 2eff781166 SDK用户菜单
Your Name 118340fa33 SDK用户菜单
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Giftbag/add.html
zyx 90665c3dc5 新增礼包bug修正
zyx 96b81a57ca 礼包添加bug修正
zyx f4bc470156 资源日志bug修复
zyx 44121ed303 新增礼包界面js bug修复
zyx 55cc0c91e4 新增礼包界面优化
zyx 63eebf5611 礼包管理新增全部,超级签选项
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
“‘ b9bd9655b7 测试资源记录及发放
ELF 0c34bb88d3 解决冲突
chenxiaojun 24b0649615 新增->游戏分包打包排序
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置