 ELF
|
fbbc30c874
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into release
|
4 years ago |
|
ELF
|
4b12a050cc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
4 years ago |
万盟天下
|
bf1c302803
|
Merge branch 'hotfix/reset_data_session' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
ca99068a0e
|
修改
|
4 years ago |
郑永星
|
4f9c672aa1
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
|
4 years ago |
zhengyongxing
|
a977cf5f31
|
聚合公司绑定修正
|
4 years ago |
|
郑永星
|
bdcc9a8e27
|
Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
|
4 years ago |
|
zhengyongxing
|
0dd7bceb3f
|
特殊比例bug修正
|
4 years ago |
|
万盟天下
|
efa4c14c89
|
Merge branch 'hotfix/reset_data_session' of wmtx/platform into release
添加会长无需重新登录/补链通知
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
郑永星
|
2c8c246d31
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
|
4 years ago |
|
zhengyongxing
|
6b486331b5
|
汇总权限测试
|
4 years ago |
|
郑永星
|
66af352eb8
|
Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
|
4 years ago |
|
zhengyongxing
|
f4f822d31a
|
公司绑定修正
|
4 years ago |
|
郑永星
|
07e877af4b
|
Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
|
4 years ago |
|
zhengyongxing
|
f757c10c61
|
绑定公司修正
|
4 years ago |
|
郑永星
|
a825f4757a
|
Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
|
4 years ago |
|
zhengyongxing
|
0ebaf6ed64
|
小bug修改
|
4 years ago |
|
ELF
|
0f534009b4
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
4 years ago |
|
郑永星
|
af65b143bb
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
c06e53ab31
|
汇总bug修正
|
4 years ago |
|
郑永星
|
e593db626c
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
4 years ago |
|
万盟天下
|
1ab2df37b6
|
Merge branch 'hotfix/add_while_view_recharge' of wmtx/platform into master
修改
|
4 years ago |
|
ELF
|
2f4868553a
|
修改
|
4 years ago |
|
万盟天下
|
c0c0bac16a
|
Merge branch 'hotfix/add_while_view_recharge' of wmtx/platform into master
修改
|
4 years ago |
陈志
|
92336383d5
|
Merge branch 'feature/new_statement_0925' of wmtx/platform into release
优化下游同游戏判断
|
4 years ago |
chenzhi
|
12e8500ce3
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
|
4 years ago |
|
ELF
|
ce1d061ee6
|
修改
|
4 years ago |
|
郑永星
|
3e82b38c1c
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
a1ac92dc02
|
押金bug修正
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
|
郑永星
|
abf6d852a5
|
Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
|
4 years ago |
|
zhengyongxing
|
ce0196afea
|
押金bug修正
|
4 years ago |
|
郑永星
|
9626ea6825
|
Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
|
4 years ago |
|
zhengyongxing
|
465f095dc4
|
市场业绩bug修正
|
4 years ago |
|
chenzhi
|
7a8b91c8f0
|
优化下游同游戏判断
|
4 years ago |
|
郑永星
|
ad8c189f73
|
Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩开发类型修正
|
4 years ago |
|
zhengyongxing
|
5c65f356b2
|
市场业绩开发类型修正
|
4 years ago |
|
郑永星
|
c7d15eb744
|
Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩提示语修正
|
4 years ago |
|
zhengyongxing
|
7a021dced5
|
市场业绩提示语修正
|
4 years ago |
|
郑永星
|
cb5e1c3b30
|
Merge branch 'feature/add_item' of wmtx/platform into release
9.29号后台功能提交
|
4 years ago |
|
zhengyongxing
|
15ad0a902b
|
Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
郑永星
|
fde38a9aec
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
聚合汇总功能提交
|
4 years ago |
|
zhengyongxing
|
dab8251c11
|
Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
Conflicts:
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Data/update.sql
|
4 years ago |
|
万盟天下
|
eca52e2c1f
|
Merge branch 'hotfix/change_game_0927' of wmtx/platform into master
优化删除游戏报错bug
|
4 years ago |
|
万盟天下
|
bfe5e543e7
|
Merge branch 'hotfix/add_game_sync' of wmtx/platform into master
游戏添加自动同步推广公司bug
|
4 years ago |
|
万盟天下
|
9209c4fe38
|
Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
|
4 years ago |
|
万盟天下
|
e2570b012f
|
Merge branch 'hotfix/add_game_sync' of wmtx/platform into release
游戏添加自动同步推广公司bug
|
4 years ago |
|
ELF
|
24fe97186e
|
修改
|
4 years ago |