825 Commits (fa9dc518d58742d6abda67936446655faa9e4eb8)

Author SHA1 Message Date
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
tping 5cf8f2ea10 特殊公司 4 years ago
ELF 88402dfac0 修改 4 years ago
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
ELF f95125892a 优化推广员后台汇总查询 4 years ago
ELF 7468057834 推广员结算订单归属 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
ELF c550846454 修改 4 years ago
ELF 47ca2f2b9e 修改 4 years ago
张谷诚 f23f456ddc Merge branch 'hotfix/orderquery' of wmtx/platform into release
增加清除时间
4 years ago
tping 5a57d87ff7 增加清空时间 4 years ago
廖金灵 a3ce776d16 Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
4 years ago
ELF 2dc69ac892 修改 4 years ago
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release 4 years ago
tping e6ae117fd7 1,隐藏删除按钮(后台->推广->游戏分包)
2,推广后台增加下单时间查询
4 years ago
廖金灵 9c6f1b6789 Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
4 years ago
ELF be9075fc63 修改bug 4 years ago
廖金灵 001b390afc Merge branch 'feature/version_1028' of wmtx/platform into release
修改评级等功能
4 years ago
ELF 34586b228e 修改 4 years ago
ELF 8c8d01a446 修改评级 4 years ago
ELF 092683425d 修改 4 years ago
ELF 3c11826a1c 修改 4 years ago
elf@home f13f3f7744 修改 4 years ago
ELF 3f92608468 推广后台功能开发 4 years ago
ELF 18c3e95f30 修改 4 years ago
ELF c5fe80639f 修改 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF dec6c4b222 修改权限 4 years ago
ELF 95248d3582 修改 4 years ago
ELF 0169d8a2db 修改 4 years ago
ELF c42a123ad7 修改 4 years ago
ELF 28fbbff699 修改 4 years ago
ELF 8d2e61153b 修改 4 years ago
elf@home c4eb04428e 修改 4 years ago
ELF afad195062 修改 4 years ago
ELF 919791c0c7 推广后台优化 4 years ago
ELF df933cc6b1 修改 4 years ago
ELF 5a184bbee1 功能优化 4 years ago
廖金灵 8ae08a6784 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限
4 years ago
ELF 2a52df9ebb 测试资源权限 4 years ago
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
4 years ago
ELF 550da5cb37 测试 4 years ago
ELF c2da9641f0 优化 4 years ago
ELF 06c4d5f1f1 优化测试资源 4 years ago
ELF 247c4e9aae ss 4 years ago
ELF 66bffbff99 吸怪 4 years ago
ELF fa90dc0bc8 修改 4 years ago
ELF 367345ea8d 修改 4 years ago
elf@home 461f347b1a 修改 4 years ago