7847 Commits (master)
 

Author SHA1 Message Date
ELF 3529e2b819 Merge branch 'hotfix/game_static_fix' into master_out 4 years ago
ELF 06a7212b20 优化 4 years ago
廖金灵 ecdbdf86b3 Merge pull request '版本更新' (#265) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/265
4 years ago
郑永星 2e21ea7c38 Merge pull request '财务打款系统bug修复' (#264) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/264
4 years ago
zhengyongxing 99d281b8e1 财务打款系统bug修复 4 years ago
郑永星 d9bb095056 Merge pull request '财务打款系统bug修复' (#263) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/263
4 years ago
zhengyongxing c772aa6854 财务打款系统bug修复 4 years ago
郑永星 9ad37cde30 Merge pull request '财务打款系统bug修复' (#262) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/262
4 years ago
zhengyongxing c1c0e3ac14 财务打款系统bug修复 4 years ago
郑永星 e5a2f7ceea Merge pull request '财务打款系统bug修复' (#261) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/261
4 years ago
zhengyongxing 0d5ab01f32 财务打款系统bug修复 4 years ago
郑永星 1239b87ce1 Merge pull request '财务打款系统bug修复' (#260) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/260
4 years ago
zhengyongxing 860d389700 财务打款系统bug修复 4 years ago
郑永星 73969d69b8 Merge pull request '财务打款系统bug修复' (#259) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/259
4 years ago
zhengyongxing f675357a2d 财务打款系统bug修复 4 years ago
郑永星 fc567339db Merge pull request '财务打款系统bug修复' (#255) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/255
4 years ago
zhengyongxing cddf09db60 财务打款系统bug修复 4 years ago
zhengyongxing eda3c9bbe4 财务打款系统bug修复 4 years ago
郑永星 f5b8c5d0dc Merge pull request '商务汇总修改' (#254) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/254
4 years ago
zhengyongxing 110e5001ee 商务汇总修改 4 years ago
郑永星 9fd18898a1 Merge pull request '商务奖金功能修改' (#252) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/252
4 years ago
zhengyongxing 859fce06c4 商务奖金功能修改 4 years ago
郑永星 5ba38df841 Merge pull request '财务打款系统bug修复' (#251) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/251
4 years ago
zhengyongxing 7178181ebb 财务打款系统bug修复 4 years ago
郑永星 4a302f6743 Merge pull request '财务打款系统bug修复' (#249) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/249
4 years ago
zhengyongxing 01a0d7c717 财务打款系统bug修复 4 years ago
郑永星 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
ELF fe5a24f530 Merge branch 'feature/upgrade_pack' into master_out 4 years ago
ELF 0af353e2da 优化 4 years ago
ELF df58c63c96 优化 4 years ago
廖金灵 260ef91ce8 Merge pull request '修改测试资源跨区bug' (#247) from hotfix/testing_resource_over_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/247
4 years ago
ELF ca9092bf75 优化 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
ELF 560fc4e4ba 优化 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