Commit Graph

1588 Commits (e97d763bc89c0168b4b170ee74619f38a254870e)

Author SHA1 Message Date
tping 792508bd64 1
tping e5b6af3771 1
tping d14cb334af Merge branch 'release' into feature/0207zgc
tping fbf0b27ca3 推广后台充值导出
ELF 2ecaa742d5 优化
ELF 91996da3a2 优化
ELF a3d3b5722c 优化
ELF 4f3c21263d 优化
ELF 531b94bae8 版本
ELF 3dfc92ecc3 修改下载超时
chenzhi 343ecc8587 优化登陆
tping e4ef55531a 特殊公司评级管理权限
tping e495105ed0 会长可以看
tping 15c841e883 Merge branch 'release' into feature/1211
tping 553ce102df 特殊公司
廖金灵 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 特殊公司
tping 33ef14e1af 特殊外团
ELF f58e565fe7 修改
ELF e5a0117912 修改
tping 31ce7b071c 1211
ELF 1b74318619 修改
ELF 88402dfac0 修改
廖金灵 1b3a365409 Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
ELF d43d0c2628 雷雨等导量公会组长可以看到充值信息
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
ELF f95125892a 优化推广员后台汇总查询
ELF 7468057834 推广员结算订单归属
ELF 289783eecd 修改
elf@home dd66846e68 根据推广公司配置推广后台
ELF 773068b57c 优化代码
ELF c550846454 修改
ELF 47ca2f2b9e 修改
ELF dd71ccdf83 修改
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
张谷诚 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 修改
廖金灵 710573f511 Merge branch 'feature/version_1028' of wmtx/platform into release
修改数据汇总bug
ELF 75754a8957 修改
张谷诚 fc666fa7b1 Merge branch 'hotfix/orderquery' of wmtx/platform into release
导出支付显示问题
tping 1c6a17d50f 支付方式显示
张谷诚 f25bc96071 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
tping adb011ca5a 到账时间
张谷诚 0c9033e700 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
tping e86f4c4762 到账时间
张谷诚 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 b44a5118cf 修改
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
万盟天下 b2098410a1 Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源发放
ELF 18c3e95f30 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF f0d79c83a2 修改
ELF dec6c4b222 修改权限
ELF 8d1a58d583 修改
ELF d33bb3f3f8 修改
ELF 2ae89b9edb 解决冲突
ELF 95248d3582 修改
ELF 0169d8a2db 修改
ELF c42a123ad7 修改
ELF 28fbbff699 修改
ELF 8d2e61153b 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF 2f4868553a 修改
ELF ce1d061ee6 修改
廖金灵 d2c5ff923b Merge branch 'hotfix/download_domain_fix' of wmtx/platform into master
落地页域名后台切换
廖金灵 04866ef988 Merge branch 'hotfix/promote_role_list' of wmtx/platform into release
推广后台角色列表优化
ELF 02c4b00bfe 优化
ELF 919791c0c7 推广后台优化
ELF df933cc6b1 修改
ELF 16122d5d9f 修改
ELF 5a184bbee1 功能优化
ELF 9f0c56d753 修改bug
ELF f37f6c51dd 修改功能
ELF ae294252ee 修改
ELF 32bc839dcd 合并
ELF 9d041f7c8a 修改
ELF 2867a05bb3 修改
ELF 3890410bec 优化
廖金灵 90bb38cd56 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改BUG
ELF b1f4ec2d9a 修改
廖金灵 747dc7394c Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
修改bug
ELF 404da03cd0 修改
廖金灵 8ae08a6784 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源权限