郑永星
|
f3cb29bd31
|
Merge pull request '商务奖金功能上传' (#248) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/248
|
4 years ago |
zhengyongxing
|
f474095a24
|
Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new
Conflicts:
Application/Admin/Controller/GameController.class.php
|
4 years ago |
|
zhengyongxing
|
619d9d547e
|
商务奖金功能上传
|
4 years ago |
 廖金灵
|
ae2fcae2a4
|
Merge pull request '优化' (#246) from hotfix/testing_resource_over_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/246
|
4 years ago |
|
ELF
|
c7341d149d
|
优化
|
4 years ago |
|
廖金灵
|
061fe402fa
|
Merge pull request '优化' (#245) from hotfix/testing_resource_over_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/245
|
4 years ago |
|
ELF
|
c7b90f54a6
|
优化
|
4 years ago |
|
廖金灵
|
de83318ee8
|
Merge pull request '测试资源' (#244) from hotfix/testing_resource_over_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/244
|
4 years ago |
|
ELF
|
5c034c3c7b
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/testing_resource_over_bug
|
4 years ago |
|
ELF
|
d7d78e748d
|
修改跨区bug
|
4 years ago |
|
廖金灵
|
8323361a9e
|
Merge pull request '强制落地页转换' (#243) from hotfix/force_landing_page into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/243
|
4 years ago |
|
廖金灵
|
65376b9a2f
|
Merge pull request '优化' (#242) from hotfix/force_landing_page into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/242
|
4 years ago |
|
ELF
|
15e1fff0ac
|
优化
|
4 years ago |
|
廖金灵
|
d3e7aeeb1e
|
Merge pull request '强制落地页以某种系统显示' (#241) from hotfix/force_landing_page into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/241
|
4 years ago |
|
ELF
|
5d92af7dcc
|
优化
|
4 years ago |
|
廖金灵
|
69301ee537
|
Merge pull request '优化子站上游比例按实际结算' (#240) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
|
4 years ago |
chenzhi
|
6c3aefcf55
|
优化子站上游比例按实际结算
|
4 years ago |
|
廖金灵
|
bcc0bb2536
|
Merge pull request '1' (#239) from hotfix/0323 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/239
|
4 years ago |
张谷成
|
e7d65249b5
|
Merge pull request 'hotfix/0323' (#238) from hotfix/0323 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/238
|
4 years ago |
tping
|
9d478c0bc7
|
1
|
4 years ago |
|
廖金灵
|
64a4923564
|
Merge pull request '财务打款系统bug修复' (#237) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
|
4 years ago |
|
zhengyongxing
|
2892562b2c
|
财务打款系统bug修复
|
4 years ago |
|
廖金灵
|
fc878671f7
|
Merge pull request 'feature/finance_payment_20210115' (#236) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/236
|
4 years ago |
|
chenzhi
|
96f832322c
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
chenzhi
|
3b447b70d0
|
优化公会统计
|
4 years ago |
|
廖金灵
|
d6dfae336b
|
Merge pull request '修改九天仙尘落地页名称显示' (#235) from hotfix/special_game_name into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
|
4 years ago |
|
ELF
|
6bc17ad982
|
修改九天仙尘落地页名称显示
|
4 years ago |
|
chenzhi
|
7ca675b520
|
优化推广员统计
|
4 years ago |
|
chenzhi
|
6c46dd0ea5
|
优化汇总
|
4 years ago |
|
廖金灵
|
f5cb94123b
|
Merge pull request '版本更新' (#234) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/234
|
4 years ago |
|
ELF
|
15fc1e966f
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into release
|
4 years ago |
|
廖金灵
|
60f8fef0b9
|
Merge pull request '版本更新' (#233) from feature/testing_game_server into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/233
|
4 years ago |
|
chenzhi
|
abb88719b5
|
新增表同步
|
4 years ago |
|
ELF
|
a2bd05ceac
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
|
4 years ago |
|
廖金灵
|
a4bbe4fe39
|
Merge pull request '修复' (#232) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
|
4 years ago |
|
ELF
|
7bb9aa833c
|
优化
|
4 years ago |
liyang
|
a960ed7c0c
|
修复
|
4 years ago |
|
ELF
|
e5d4c2e231
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
|
4 years ago |
|
廖金灵
|
1b4fb17d2c
|
Merge pull request 'feature/LY0309' (#231) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
|
4 years ago |
|
ELF
|
5bf8961f14
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
|
4 years ago |
|
ELF
|
8dee426c5f
|
优化
|
4 years ago |
|
liyang
|
da588a3d86
|
修复
|
4 years ago |
|
廖金灵
|
9973e72bf3
|
Merge pull request 'feature/add_item' (#229) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/229
|
4 years ago |
|
郑永星
|
77532bdb08
|
Merge pull request 'feature/add_item' (#230) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
|
4 years ago |
|
zhengyongxing
|
97fae33c43
|
公会信息功能提交
|
4 years ago |
|
zhengyongxing
|
f69b0ddf14
|
公会信息功能提交
|
4 years ago |
|
liyang
|
42a8fc94f7
|
角色查询-本推广号
|
4 years ago |
|
chenzhi
|
57abd846c6
|
新增财务汇总重算
|
4 years ago |
|
郑永星
|
841e875e40
|
Merge pull request '结算单编辑功能负数可编辑' (#228) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
|
4 years ago |
|
zhengyongxing
|
d7f13aad93
|
结算单编辑功能负数可编辑
|
4 years ago |