chenzhi
|
c11266291f
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time
|
4 years ago |
|
chenzhi
|
63054ac0d8
|
优化订单校验
|
4 years ago |
zhengyongxing
|
ea21948984
|
支付渠道bug修改
|
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 |
 廖金灵
|
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 |
|
chenzhi
|
bc75da8c14
|
解决冲突
|
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 |
|
ELF
|
990a2bd206
|
解决冲突
|
4 years ago |
|
chenzhi
|
a020cb26df
|
新增不验证手机 己方
|
4 years ago |
|
chenzhi
|
91ae987c3c
|
优化游戏比例分成无需大于
|
4 years ago |
|
ELF
|
7c3a001e25
|
修改
|
4 years ago |
|
chenzhi
|
4fde001d4e
|
优化游戏分成比例不受档位限制
|
4 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
4 years ago |
|
ELF
|
e94b6418f1
|
修改
|
4 years ago |
|
ELF
|
8224cfb362
|
修改
|
4 years ago |
|
ELF
|
77c692c44d
|
修改
|
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 |
|
ELF
|
73f5f4f5ea
|
修改
|
4 years ago |
|
ELF
|
38c10a0f7a
|
修改
|
4 years ago |
|
ELF
|
10aed50db7
|
修改
|
4 years ago |
|
ELF
|
f9b054e1cb
|
修改
|
4 years ago |
|
ELF
|
f0a8b6bc3b
|
修改
|
4 years ago |
|
ELF
|
6f2f588617
|
优化
|
4 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
4 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
4 years ago |
|
廖金灵
|
bc00b1112f
|
Merge branch 'feature/apply_game' of wmtx/platform into release
task440
|
4 years ago |
|
廖金灵
|
db32f11215
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
|
4 years ago |
|
chenzhi
|
7d8dca7421
|
取消测试的虚拟验证码
|
4 years ago |
|
chenzhi
|
95d9f45612
|
新增检索
|
4 years ago |
|
廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
4 years ago |
yulingwei
|
c8924779c4
|
Merge branch 'release' into feature/ylw-06-17
|
4 years ago |
|
yulingwei
|
8c18f2aa1d
|
1
|
4 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
4 years ago |
|
ELF
|
2589806e62
|
解决冲突
|
4 years ago |
|
yulingwei
|
3f4406a1ee
|
Merge branch 'release' into feature/ylw-06-17
|
4 years ago |
|
yulingwei
|
0decb03cb1
|
merge
|
4 years ago |