zhengyongxing
|
962d140d80
|
Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
|
4 years ago |
|
zhengyongxing
|
043ee29f54
|
市场专员业绩计bug修正
|
4 years ago |
|
zhengyongxing
|
8430444b8e
|
市场专员业绩计bug修正
|
4 years ago |
|
zhengyongxing
|
2da9821caf
|
市场专员业绩计算修正
|
4 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
4 years ago |
|
zhengyongxing
|
ea21948984
|
支付渠道bug修改
|
4 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
4 years ago |
 廖金灵
|
29159f0d7c
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化游戏获取逻辑
|
4 years ago |
chenzhi
|
c18eb439c5
|
优化游戏获取逻辑
|
4 years ago |
|
zhengyongxing
|
1c535ee74b
|
市场专员业绩管理 重算调用脚本命令修改
|
4 years ago |
|
zhengyongxing
|
bdeacbd718
|
市场专员业绩管理 重算调用脚本命令修改
|
4 years ago |
|
zhengyongxing
|
c96340afa9
|
市场专员业绩管理bug修改
|
4 years ago |
|
廖金灵
|
697a975ca6
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化检索
|
4 years ago |
|
chenzhi
|
048931ce9e
|
优化搜索3
|
4 years ago |
|
chenzhi
|
35380ae9b0
|
优化搜索2
|
4 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
4 years ago |
|
zhengyongxing
|
1e80004e3e
|
市场专员业绩管理bug修改
|
4 years ago |
|
zhengyongxing
|
17ff8d9029
|
市场专员业绩管理模板指定
|
4 years ago |
|
zhengyongxing
|
70d6c3c7bf
|
市场专员业绩管理权限判断
|
4 years ago |
|
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
|
4 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
4 years ago |
|
廖金灵
|
24100fe0a9
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
移除合作方合同时间限制
|
4 years ago |
|
chenzhi
|
490197a490
|
移除合作方合同时间限制
|
4 years ago |
|
廖金灵
|
89edac1fee
|
Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
|
4 years ago |
|
廖金灵
|
56619e58b7
|
Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
|
4 years ago |
|
ELF
|
3f42d2967c
|
修改
|
4 years ago |
|
廖金灵
|
27e07556fb
|
Merge branch 'hotfix/spend_arpu' of wmtx/platform into master
修改bug
|
4 years ago |
|
廖金灵
|
b05cf6f934
|
Merge branch 'hotfix/spend_arpu' of wmtx/platform into release
修改bug
|
4 years ago |
|
ELF
|
70c9e26ce4
|
修改bug
|
4 years ago |
|
zhengyongxing
|
06bd0bf848
|
市场专员业绩管理代码提交
|
4 years ago |
|
廖金灵
|
4e3baaab8f
|
Merge branch 'release' of wmtx/platform into master
版本更新
|
4 years ago |
|
廖金灵
|
4a755d2269
|
Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
|
4 years ago |
|
ELF
|
ecc228409d
|
修改
|
4 years ago |
|
廖金灵
|
ed9d193531
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
3128c079d3
|
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
ef8d16fc6e
|
推广员充值换榜定时器优化
|
4 years ago |
|
zhengyongxing
|
acc45f5911
|
江息网络漏掉的修改
|
4 years ago |
|
廖金灵
|
65d746c75f
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
隐藏推广公司比例
|
4 years ago |
|
chenzhi
|
bc75da8c14
|
解决冲突
|
4 years ago |
|
廖金灵
|
cc12b3d590
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值汇总优化，补单功能添加
|
4 years ago |
|
zhengyongxing
|
15b9efcd7e
|
江息网络漏掉的修改
|
4 years ago |
|
zhengyongxing
|
1234349844
|
市场专员业绩计算修改
|
4 years ago |
|
chenzhi
|
f62cfca22b
|
隐藏推广公司分成比例
|
4 years ago |
|
zhengyongxing
|
dbad9a08db
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
Conflicts:
Application/Admin/Common/function.php
Application/Admin/Controller/TimingController.class.php
|
4 years ago |
|
chenzhi
|
21a738054a
|
隐藏推广公司比例
|
4 years ago |
|
zhengyongxing
|
39e2bce6dd
|
推广员充值统计提交
|
4 years ago |
|
zhengyongxing
|
2bc4bf79d9
|
市场结算管理公司税率提交
|
4 years ago |
|
廖金灵
|
00b69f820f
|
Merge branch 'feature/market_admin' of wmtx/platform into release
市场绑定换绑
|
4 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
4 years ago |
|
廖金灵
|
8455acd392
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
新增不验证手机 己方
|
4 years ago |