郑永星
|
3bc318daf3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例申请功能提交
|
5 years ago |
zhengyongxing
|
418d5a6bda
|
特殊比例申请功能提交
|
5 years ago |
 廖金灵
|
b05ba946a3
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
上下游功能聚合
|
5 years ago |
|
廖金灵
|
d48e90e1db
|
Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
|
5 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
5 years ago |
|
廖金灵
|
3690b7d000
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
|
5 years ago |
|
ELF
|
ae294252ee
|
修改
|
5 years ago |
|
郑永星
|
65da5b6b6e
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点功能修改
|
5 years ago |
|
zhengyongxing
|
23555f8d4d
|
特殊补点功能修改
|
5 years ago |
|
郑永星
|
5a60c36b7a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
|
5 years ago |
|
zhengyongxing
|
0215082018
|
特殊补点bug修正
|
5 years ago |
|
zhengyongxing
|
3022525c85
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
5 years ago |
|
zhengyongxing
|
cd331f2c64
|
上下游聚合打款信息修改
|
5 years ago |
陈志
|
b80d36395a
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化导出
|
5 years ago |
chenzhi
|
9234919180
|
优化导出
|
5 years ago |
|
陈志
|
a78188632f
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
6cb4ecb930
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
5 years ago |
|
郑永星
|
e3a19c8fc6
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点汇总功能修改
|
5 years ago |
|
zhengyongxing
|
2c005d1996
|
特殊补点汇总功能修改
|
5 years ago |
|
zhengyongxing
|
4ed51cb112
|
上下游聚合打款信息修改
|
5 years ago |
|
chenzhi
|
c795e5de6c
|
优化下游个人汇总样式
|
5 years ago |
|
郑永星
|
23966187c0
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点功能修正
|
5 years ago |
|
zhengyongxing
|
f4aeae340d
|
特殊补点功能修正
|
5 years ago |
|
郑永星
|
d0aec76e3e
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
565d3c9576
|
特殊补点功能修改
|
5 years ago |
|
陈志
|
faa628977b
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
73dff8839e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
5 years ago |
|
陈志
|
8fbf101e88
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
|
5 years ago |
|
chenzhi
|
ce5a83e9bc
|
优化汇总导出错误
|
5 years ago |
|
zhengyongxing
|
50495e73ca
|
特殊补点功能修改
|
5 years ago |
|
zhengyongxing
|
6103908d83
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementController.class.php
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
5 years ago |
|
zhengyongxing
|
872de1ff73
|
上下游聚合打款信息修改
|
5 years ago |
|
zhengyongxing
|
b75e0725a1
|
特殊补点功能修改
|
5 years ago |
|
zhengyongxing
|
9265d7c9b6
|
上下游聚合打款信息修改
|
5 years ago |
|
ELF
|
1fbb9f097e
|
ss
|
5 years ago |
|
ELF
|
53f2649d9a
|
ss
|
5 years ago |
|
ELF
|
32bc839dcd
|
合并
|
5 years ago |
|
陈志
|
fbdab69c71
|
Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
|
5 years ago |
|
ELF
|
e0bbec0978
|
修改
|
5 years ago |
|
chenzhi
|
57b692cd67
|
优化上游添加错误
|
5 years ago |
|
陈志
|
be2851cecc
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
180332ab87
|
优化下游未汇总导出
|
5 years ago |
|
ELF
|
ad2037408d
|
优化
|
5 years ago |
|
陈志
|
25a9ea7262
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
新增线下打款确认
|
5 years ago |
|
chenzhi
|
4a98c587fa
|
新增线下打款确认
|
5 years ago |
|
ELF
|
7614d5feca
|
修改
|
5 years ago |
|
ELF
|
9d041f7c8a
|
修改
|
5 years ago |
|
ELF
|
e441f030c0
|
优化
|
5 years ago |
|
ELF
|
e9038d7471
|
ss
|
5 years ago |
|
chenzhi
|
69cf42e895
|
新增线下确认打款
|
5 years ago |