Commit Graph

825 Commits (d0ee96f7b5bd4cc2bd587d4aaf7960203260fade)

Author SHA1 Message Date
廖金灵 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 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF 919791c0c7 推广后台优化
ELF df933cc6b1 修改
ELF 5a184bbee1 功能优化
廖金灵 8ae08a6784 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限
ELF 2a52df9ebb 测试资源权限
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
ELF 550da5cb37 测试
ELF c2da9641f0 优化
ELF 06c4d5f1f1 优化测试资源
ELF 247c4e9aae ss
ELF 66bffbff99 吸怪
ELF fa90dc0bc8 修改
ELF 367345ea8d 修改
elf@home 461f347b1a 修改