Commit Graph

5473 Commits (d4d22e5eff145b911af0f1bcd18f3a516bbc609d)
 

Author SHA1 Message Date
廖金灵 d4d22e5eff Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩计bug修正
zhengyongxing de3d7d52b7 市场专员业绩计bug修正
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
廖金灵 65288392e3 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩计bug修正
zhengyongxing 043ee29f54 市场专员业绩计bug修正
zhengyongxing 8430444b8e 市场专员业绩计bug修正
zhengyongxing 2da9821caf 市场专员业绩计算修正
廖金灵 e3723293dd Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
zhengyongxing 9a23b5588b 市场专员业绩计算修正
zhengyongxing ea21948984 支付渠道bug修改
zhengyongxing 97161900ac 市场专员业绩管理bug修改
廖金灵 29159f0d7c Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化游戏获取逻辑
chenzhi c18eb439c5 优化游戏获取逻辑
廖金灵 5f0ebf3958 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理 重算调用脚本命令修改
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改
廖金灵 a3e85efc5e Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理 重算调用脚本命令修改
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改
廖金灵 7fa94edfbe Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
zhengyongxing c96340afa9 市场专员业绩管理bug修改
廖金灵 697a975ca6 Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化检索
chenzhi 048931ce9e 优化搜索3
chenzhi 35380ae9b0 优化搜索2
chenzhi 587d7913ca 优化检索
廖金灵 b275ef6423 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改
廖金灵 6ffe1ca992 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理模板指定
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定
廖金灵 b2f928ed57 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理权限判断
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断
廖金灵 5a0aa4f208 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩计算管理
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
zhengyongxing 83717b64ae 市场专员业绩管理优化
廖金灵 24100fe0a9 Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
移除合作方合同时间限制
chenzhi 490197a490 移除合作方合同时间限制
廖金灵 89edac1fee Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
廖金灵 56619e58b7 Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
ELF 3f42d2967c 修改
廖金灵 27e07556fb Merge branch 'hotfix/spend_arpu' of wmtx/platform into master
修改bug
廖金灵 b05cf6f934 Merge branch 'hotfix/spend_arpu' of wmtx/platform into release
修改bug
ELF 70c9e26ce4 修改bug
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交
廖金灵 4e3baaab8f Merge branch 'release' of wmtx/platform into master
版本更新
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
ELF ecc228409d 修改
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
zhengyongxing 3128c079d3 推广员充值换榜定时器优化
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化
zhengyongxing acc45f5911 江息网络漏掉的修改
廖金灵 65d746c75f Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
隐藏推广公司比例
chenzhi bc75da8c14 解决冲突