Commit Graph

911 Commits (d5998e722e9d8462c403c9b47c4eb05322f5c92d)
 

Author SHA1 Message Date
ELF 260e45f4d9 Merge branch 'hotfix/query' into dev
ELF 4bb09e1a96 Merge branch 'hotfix/query'
ELF 2816054361 修改bug
zhengchanglong ec07cedc5e Merge branch 'dev_zcl' into dev
chenzhi 5d7385e77a 登陆bug优化
zyx e23943cfdb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx bb3109f5d3 测试账号冻结状态需要的字段修改
zhengchanglong 32595840c3 Merge branch 'dev_zcl' into dev
chenzhi a54a6b8b26 优化bug
zyx 5ffc0bf9b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 560e13af03 更改文章详情的后退按钮的样式
ELF cdfbe61fa2 Merge branch 'hotfix/pc' into dev
ELF 6cd1ece692 Merge branch 'hotfix/pc'
chenxiaojun bb23bb2a03 推广员后台->检索bug修复
chenxiaojun a5873caf8d 推广员后台->检索bug修复
jbrazz 2d94c4a539 fix
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
zyx 3c1b1673f2 测试资源申请页面检索数据修正,检索都统一改为模糊查询,文章详情页隐藏首页,添加返回按钮
ELF 608d24b732 开放测试帐号
ELF b1594e2363 Merge branch 'hotfix/query'
ELF 554793d95e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c888915daa Merge branch 'hotfix/query' into dev
ELF ece317d6fa 修改bug
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
Your Name 51154dd533 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 22e7866644 SDK菜单添加
zhengchanglong 8af781b9b4 修改超级签充值金额
zhengchanglong f5b21850f8 Merge branch 'dev_zcl' into dev
chenzhi 4dba7bcfeb 修复严重码bug
zyx dad52fd56c 更改tab_test_resource的排序规则,改为二进制排序以便区分大小写
Your Name 45ff545256 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name f1b5a2257d SDK用户菜单-修改
zhengchanglong d2d7dec38a 超级签页面title修改
zhengchanglong b46921447a 微信支付回跳修改
zhengchanglong 68c9c492c5 微信支付回跳修改
zhengchanglong 941303065d Merge branch 'dev_zcl' into dev
zhengchanglong eea9cc772c 微信支付回跳修改
zyx 97ccd1d57a 解决游戏公告无法发出的问题
zyx 91b773d974 开服信息,平台显示修正
zyx 7e27d35a97 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 9eb36bd81f 组长账号显示测试资源
chenxiaojun 3fa68c6f0c 官网->商务合作公司地址修改
chenxiaojun dbf0f67d19 官网->商务合作公司地址修改
chenxiaojun 7d018b47af 官网->商务合作公司地址修改
chenxiaojun 165d9dad62 官网->商务合作公司地址修改
zyx ccf7bfc65a 首页开服信息图标大小修改
zhengchanglong 58f489199c 删除冗余代码
Your Name 032b2b5197 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev