chenzhi
|
04e13844c3
|
zancun
|
5 years ago |
zhengyongxing
|
962d140d80
|
Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
|
5 years ago |
 廖金灵
|
65288392e3
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩计bug修正
|
5 years ago |
|
zhengyongxing
|
043ee29f54
|
市场专员业绩计bug修正
|
5 years ago |
|
zhengyongxing
|
8430444b8e
|
市场专员业绩计bug修正
|
5 years ago |
|
zhengyongxing
|
2da9821caf
|
市场专员业绩计算修正
|
5 years ago |
|
廖金灵
|
e3723293dd
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
|
5 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
5 years ago |
|
廖金灵
|
46be83597b
|
Merge branch 'hotfix/pay_channel_modify' of wmtx/platform into master
支付渠道bug修改
|
5 years ago |
|
zhengyongxing
|
ea21948984
|
支付渠道bug修改
|
5 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
5 years ago |
|
廖金灵
|
29159f0d7c
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化游戏获取逻辑
|
5 years ago |
|
chenzhi
|
c18eb439c5
|
优化游戏获取逻辑
|
5 years ago |
|
廖金灵
|
5f0ebf3958
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
zhengyongxing
|
1c535ee74b
|
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
廖金灵
|
a3e85efc5e
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
zhengyongxing
|
bdeacbd718
|
市场专员业绩管理 重算调用脚本命令修改
|
5 years ago |
|
廖金灵
|
7fa94edfbe
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
|
5 years ago |
|
zhengyongxing
|
c96340afa9
|
市场专员业绩管理bug修改
|
5 years ago |
|
廖金灵
|
697a975ca6
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
优化检索
|
5 years ago |
|
chenzhi
|
048931ce9e
|
优化搜索3
|
5 years ago |
|
chenzhi
|
35380ae9b0
|
优化搜索2
|
5 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
5 years ago |
|
廖金灵
|
b275ef6423
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理bug修改
|
5 years ago |
|
zhengyongxing
|
1e80004e3e
|
市场专员业绩管理bug修改
|
5 years ago |
|
廖金灵
|
6ffe1ca992
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理模板指定
|
5 years ago |
|
zhengyongxing
|
17ff8d9029
|
市场专员业绩管理模板指定
|
5 years ago |
|
廖金灵
|
b2f928ed57
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩管理权限判断
|
5 years ago |
|
zhengyongxing
|
70d6c3c7bf
|
市场专员业绩管理权限判断
|
5 years ago |
|
廖金灵
|
5a0aa4f208
|
Merge branch 'feature/market_percentage' of wmtx/platform into release
市场专员业绩计算管理
|
5 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
|
5 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
5 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
5 years ago |
|
chenzhi
|
0dda3b1c61
|
优化合同不需要限制时间
|
5 years ago |
|
廖金灵
|
24100fe0a9
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
移除合作方合同时间限制
|
5 years ago |
|
chenzhi
|
490197a490
|
移除合作方合同时间限制
|
5 years ago |
|
chenzhi
|
03f4130e9e
|
新增上游合作
|
5 years ago |
|
廖金灵
|
89edac1fee
|
Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
|
5 years ago |
|
廖金灵
|
56619e58b7
|
Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
|
5 years ago |
|
ELF
|
3f42d2967c
|
修改
|
5 years ago |
|
廖金灵
|
27e07556fb
|
Merge branch 'hotfix/spend_arpu' of wmtx/platform into master
修改bug
|
5 years ago |
|
廖金灵
|
b05cf6f934
|
Merge branch 'hotfix/spend_arpu' of wmtx/platform into release
修改bug
|
5 years ago |
|
ELF
|
70c9e26ce4
|
修改bug
|
5 years ago |
|
zhengyongxing
|
06bd0bf848
|
市场专员业绩管理代码提交
|
5 years ago |
|
廖金灵
|
4e3baaab8f
|
Merge branch 'release' of wmtx/platform into master
版本更新
|
5 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
5 years ago |
|
廖金灵
|
4a755d2269
|
Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
|
5 years ago |
|
ELF
|
ecc228409d
|
修改
|
5 years ago |
|
廖金灵
|
ed9d193531
|
Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
|
5 years ago |