Commit Graph

4184 Commits (3eb6fbad4d436e2f8d37ff709e474a7fd7859ca4)

Author SHA1 Message Date
郑永星 3eb6fbad4d Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/196
zhengyongxing 55c75e159c 热更修复
zhengyongxing 55ffc36a10 2.28号功能提交
zhengyongxing 4aa569d092 2.28号功能提交
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
优化连接
chenzhi 75850db849 优化测试
chenzhi 0a0ee66012 优化连接
chenzhi cc59050261 优化权限添加
陈志 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号功能提交
chenzhi 7756efe859 优化结算单显示
zhengyongxing 2af6231106 2.28号功能提交
zhengyongxing 5556bbf171 2.28号功能提交
zhengyongxing 9837ba3682 2.28号功能提交
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
chenzhi 12f84844c4 新增权限审核
zhengyongxing 016c2e11bd 2.28号功能提交
chenzhi a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 0b4e9fa9a1 优化重算
郑永星 23147ac0cc Merge pull request '2.28号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
zhengyongxing 4425750972 2.28号功能提交
chenzhi 3263c108c3 新增个人结算
chenzhi c285a88c8d 优化子站生成数据
chenzhi 7d650a9595 子站内团脚本
chenzhi a439946207 优化子站启动脚本
chenzhi 4024e45c64 优化子站上游结算
chenzhi e6e8e1d0b3 暂存
chenzhi b75bcdbb1c 新增上游导出查看
郑永星 b7a120c56a Merge pull request '2.10号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
zhengyongxing c2bfcd39b6 2.10号功能提交
郑永星 f078bfd8b6 Merge pull request '2.10号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
zhengyongxing 4419f1539c 2.10号功能提交
郑永星 3c760984ab Merge pull request '2.10号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/170
zhengyongxing 9b2f7b1a61 2.10号功能提交
陈志 6d60674031 Merge pull request '优化永星bug' () from feature/finance_payment_20210115 into release
优化永星bug