Commit Graph

1012 Commits (727873e25cf3888dbbf4ffb191978418efbf5092)

Author SHA1 Message Date
tping fbf0b27ca3 推广后台充值导出
ELF 91996da3a2 优化
ELF a3d3b5722c 优化
ELF 4f3c21263d 优化
ELF 531b94bae8 版本
ELF 3dfc92ecc3 修改下载超时
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@home dd66846e68 根据推广公司配置推广后台
ELF 773068b57c 优化代码
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 修改