Commit Graph

841 Commits (83cc2aa6ec72df1d5be38073ab57111ddae49b67)

Author SHA1 Message Date
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
liyang a960ed7c0c 修复
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 8dee426c5f 优化
liyang da588a3d86 修复
liyang a457750390 角色查询、额外额度、测试资源权限修改
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309
liyang f8b93616ce 菜单封装中
ELF 1ab1db12ab 修复苹果落地页无法滚动bug
廖金灵 36becfb8d6 Merge pull request '1' () from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
liyang 65ca417a2e 推广后台资源申请页面
tping fb3bcdd107 1
tping f3efd97a19 1
ELF 2ecaa742d5 优化
ELF 4f3c21263d 优化
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
tping 5cf8f2ea10 特殊公司
ELF 88402dfac0 修改
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF f95125892a 优化推广员后台汇总查询
ELF 7468057834 推广员结算订单归属
elf@home dd66846e68 根据推广公司配置推广后台
ELF c550846454 修改
ELF 47ca2f2b9e 修改
张谷诚 f23f456ddc Merge branch 'hotfix/orderquery' of wmtx/platform into release
增加清除时间
tping 5a57d87ff7 增加清空时间
廖金灵 a3ce776d16 Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
ELF 2dc69ac892 修改
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release
tping e6ae117fd7 1,隐藏删除按钮(后台->推广->游戏分包)
2,推广后台增加下单时间查询
廖金灵 9c6f1b6789 Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
ELF be9075fc63 修改bug
廖金灵 001b390afc Merge branch 'feature/version_1028' of wmtx/platform into release
修改评级等功能
ELF 34586b228e 修改
ELF 8c8d01a446 修改评级
ELF 092683425d 修改
ELF 3c11826a1c 修改
elf@home f13f3f7744 修改
ELF 3f92608468 推广后台功能开发
ELF 18c3e95f30 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF dec6c4b222 修改权限
ELF 95248d3582 修改
ELF 0169d8a2db 修改
ELF c42a123ad7 修改
ELF 28fbbff699 修改
ELF 8d2e61153b 修改