Commit Graph

7699 Commits (d3e7aeeb1e0cdb7a80e4e0e6005f67aa4ca1ce68)
 

Author SHA1 Message Date
廖金灵 d3e7aeeb1e Merge pull request '强制落地页以某种系统显示' () from hotfix/force_landing_page into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/241
ELF 5d92af7dcc 优化
张谷成 e7d65249b5 Merge pull request 'hotfix/0323' () from hotfix/0323 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/238
tping 9d478c0bc7 1
廖金灵 64a4923564 Merge pull request '财务打款系统bug修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
zhengyongxing 2892562b2c 财务打款系统bug修复
廖金灵 fc878671f7 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/236
chenzhi 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 3b447b70d0 优化公会统计
廖金灵 d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' () from hotfix/special_game_name into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
ELF 6bc17ad982 修改九天仙尘落地页名称显示
chenzhi 7ca675b520 优化推广员统计
chenzhi 6c46dd0ea5 优化汇总
廖金灵 f5cb94123b Merge pull request '版本更新' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/234
ELF 15fc1e966f Merge branch 'master' of 8.136.139.249:wmtx/platform into release
廖金灵 60f8fef0b9 Merge pull request '版本更新' () from feature/testing_game_server into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/233
chenzhi abb88719b5 新增表同步
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
廖金灵 a4bbe4fe39 Merge pull request '修复' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
ELF 7bb9aa833c 优化
liyang a960ed7c0c 修复
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
廖金灵 1b4fb17d2c Merge pull request 'feature/LY0309' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 8dee426c5f 优化
liyang da588a3d86 修复
廖金灵 9973e72bf3 Merge pull request 'feature/add_item' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/229
郑永星 77532bdb08 Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
zhengyongxing 97fae33c43 公会信息功能提交
zhengyongxing f69b0ddf14 公会信息功能提交
liyang 42a8fc94f7 角色查询-本推广号
chenzhi 57abd846c6 新增财务汇总重算
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
zhengyongxing 22b17c5010 市场业绩系统bug修复
zhengyongxing c06b954bf7 市场业绩bug修复
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
zhengyongxing 7c60d8321b 市场业绩bug修正
liyang 5cd8ca2857 角色查询、额外额外、测试资源权限修改
liyang a457750390 角色查询、额外额度、测试资源权限修改
廖金灵 2690db95ab Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
郑永星 6051f9ee2a Merge pull request '子系统上游修正' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
chenzhi b19d73388b 子站游戏订单bug
zhengyongxing 68c873983b 子系统上游修正
chenzhi ce90ddf3ad 优化推广员统计
廖金灵 8e571e0808 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
chenzhi c91206c176 优化推广员统计
chenzhi 7c460cdb47 优化支付导出