Commit Graph

258 Commits (c80609be77c520c7a96edaae930b0e31d1c6a844)

Author SHA1 Message Date
廖金灵 39d40b59e2 Merge pull request '优化' () from feature/game_rebate1 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/451
ELF d3e4c40d44 优化
廖金灵 a874de5fe6 Merge pull request 'feature/game_rebate1' () from feature/game_rebate1 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/450
ELF 82bc905b45 返利优化
ELF ba3d1dadd2 优化
ELF 0a3027796f 返利添加游戏
廖金灵 813a05a04c Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/430
ELF f2d5faf211 封禁链接
chenzhi 3d215d57aa 优化会长添加或者换绑引起的市场变化
chenzhi aae58f024b 优化添加会长
ELF 69922e73a1 有害
ELF 0ea585bd96 游戏返利
廖金灵 84a6b21f88 Merge pull request '优化' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
ELF 9fb91c4a66 优化
廖金灵 742bb493c1 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/387
ELF 4e1cf805ea 优化
ELF 78a24c78f5 优化
廖金灵 175cfbf71c Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/372
ELF 9f37c6db3c 有害
ELF 23feb76e09 有害
ELF b9092a4501 有害
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi c4849ffc7c 新增商户固定
ELF 80e02733e7 封禁推广员推广链接
ELF 90d82b1a8d 有害
ELF 8440c5d384 优化
ELF bfa0c5c5b8 迁移优化
ELF d7d78e748d 修改跨区bug
ELF 7bb9aa833c 优化
ELF 8dee426c5f 优化
ELF 8a815af691 优化
ELF a355c2b579 优化
elf@home 23643d2e0b 修改
ELF 874ba3a705 修改i哎
ELF 0aa3c514d7 优化
ELF 531b94bae8 版本
elf@home 34e25f293a 推广员添加每级id
廖金灵 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 31ce7b071c 1211
ELF 1b74318619 修改
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 c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
ELF c550846454 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化