Commit Graph

7611 Commits (5f3c726a05c419aa817ceecacb5e835a38729a11)
 

Author SHA1 Message Date
chenzhi 5f3c726a05 优化游戏统计合计
chenzhi 243dce02ca 优化聚合万盟数据
廖金灵 57bf0929b3 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/199
chenzhi aa99f1f668 新增审核撤回
chenzhi 88d02f7be1 优化导出提醒-zyx
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
zhengyongxing 3900a4081a 财务子系统bug修复
zhengyongxing ae3ad391fd 新功能开发
廖金灵 96c6a47dd5 Merge pull request '热更修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
zhengyongxing a84a69fd56 热更修复
廖金灵 e678cc55f8 Merge pull request '修复苹果落地页无法滚动bug' () from hotfix/landing-ios-fixed into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/195
ELF 1ab1db12ab 修复苹果落地页无法滚动bug
廖金灵 e9507ddb95 Merge pull request '热更修复汇总上游时间错误' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
zhengyongxing 55c75e159c 热更修复
廖金灵 df747704ba Merge pull request '2.28号功能提交' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
zhengyongxing 55ffc36a10 2.28号功能提交
廖金灵 bd20d4a770 Merge pull request '2.28号功能提交' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
zhengyongxing 4aa569d092 2.28号功能提交
廖金灵 c41981735b Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/191
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
优化连接
chenzhi 75850db849 优化测试
chenzhi 0a0ee66012 优化连接
chenzhi cc59050261 优化权限添加
廖金灵 9958c8a281 Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/189
陈志 a26b10ab2c Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
优化上游
chenzhi a33ea0d575 优化上游
chenzhi e8dea24f46 新增周结
陈志 a85ae5125c Merge pull request '优化子站平台币充值区分万盟' () from feature/finance_payment_20210115 into release
优化子站平台币充值区分万盟
chenzhi 55572ce862 优化子站平台币充值区分万盟
郑永星 0c465ef26d Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/186
zhengyongxing 886bbfcfc2 2.28号功能提交
郑永星 1b86292c4e Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/185
zhengyongxing 73beadd929 2.28号功能提交
郑永星 d73e2bae02 Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/184
zhengyongxing bc3f4f02d3 2.28号功能提交
郑永星 727873e25c Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/183
zhengyongxing 1ec35eeb32 2.28号功能提交
陈志 97e9a1328e Merge pull request '优化结算单显示' () from feature/finance_payment_20210115 into release
优化结算单显示
chenzhi 7756efe859 优化结算单显示
zhengyongxing 2af6231106 2.28号功能提交
郑永星 36e21f4049 Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/180
zhengyongxing 5556bbf171 2.28号功能提交
郑永星 3e8f35ba41 Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/179
zhengyongxing 9837ba3682 2.28号功能提交
郑永星 f12dd32915 Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/178
zhengyongxing 0be51f4d62 2.28号功能提交
郑永星 0f39caaf60 Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
zhengyongxing c6587b61a5 2.28号功能提交
zhengyongxing 8e28b1c4ad 2.28号功能提交
郑永星 dfdcedea38 Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176