chenzhi
|
04e13844c3
|
zancun
|
4 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
4 years ago |
|
chenzhi
|
c18eb439c5
|
优化游戏获取逻辑
|
4 years ago |
|
chenzhi
|
048931ce9e
|
优化搜索3
|
4 years ago |
|
chenzhi
|
35380ae9b0
|
优化搜索2
|
4 years ago |
|
chenzhi
|
587d7913ca
|
优化检索
|
4 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
4 years ago |
|
chenzhi
|
0dda3b1c61
|
优化合同不需要限制时间
|
4 years ago |
 廖金灵
|
24100fe0a9
|
Merge branch 'hotfix/change_cp_time' of wmtx/platform into master
移除合作方合同时间限制
|
4 years ago |
|
chenzhi
|
490197a490
|
移除合作方合同时间限制
|
4 years ago |
|
chenzhi
|
03f4130e9e
|
新增上游合作
|
4 years ago |
|
廖金灵
|
89edac1fee
|
Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
|
4 years ago |
|
ELF
|
3f42d2967c
|
修改
|
4 years ago |
|
廖金灵
|
27e07556fb
|
Merge branch 'hotfix/spend_arpu' of wmtx/platform into master
修改bug
|
4 years ago |
|
ELF
|
70c9e26ce4
|
修改bug
|
4 years ago |
|
廖金灵
|
4e3baaab8f
|
Merge branch 'release' of wmtx/platform into master
版本更新
|
4 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
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 |
|
廖金灵
|
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 |
|
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 |
|
廖金灵
|
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 |
|
chenzhi
|
a020cb26df
|
新增不验证手机 己方
|
4 years ago |
|
廖金灵
|
a40a3b36bb
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化比例分成无需大于上月
|
4 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
4 years ago |
|
chenzhi
|
9dd4a507e9
|
隐藏模板批量操作
|
4 years ago |
|
chenzhi
|
f1824fd7b3
|
优化新增名称
|
4 years ago |
|
ELF
|
7c3a001e25
|
修改
|
4 years ago |
|
chenzhi
|
4fde001d4e
|
优化游戏分成比例不受档位限制
|
4 years ago |
|
ELF
|
102e77267d
|
修改bug
|
4 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
4 years ago |
|
ELF
|
e94b6418f1
|
修改
|
4 years ago |
|
ELF
|
8224cfb362
|
修改
|
4 years ago |
|
ELF
|
77c692c44d
|
修改
|
4 years ago |
|
zhengyongxing
|
ca5c68d078
|
推广公司编辑添加合并错误去除
|
4 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
zhengyongxing
|
2fae4219df
|
公会统计去除
|
4 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
4 years ago |
|
ELF
|
e3b53e7df1
|
修改
|
4 years ago |