Commit Graph

7572 Commits (73beadd9292547b8bf8ee10650d776c56a62ca78)
 

Author SHA1 Message Date
zhengyongxing 73beadd929 2.28号功能提交
zhengyongxing bc3f4f02d3 2.28号功能提交
zhengyongxing 1ec35eeb32 2.28号功能提交
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
陈志 e278c9de76 Merge pull request '新增权限审核' () from feature/finance_payment_20210115 into release
新增权限审核
chenzhi 12f84844c4 新增权限审核
zhengyongxing 016c2e11bd 2.28号功能提交
陈志 234ce8817d Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
子站结算
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号功能提交
廖金灵 10707657c5 Merge pull request '版本上线' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/169
陈志 6d60674031 Merge pull request '优化永星bug' () from feature/finance_payment_20210115 into release
优化永星bug
chenzhi 098ba97d3e 优化永星bug
廖金灵 36becfb8d6 Merge pull request '1' () from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
廖金灵 81ac1baaf1 Merge pull request '额外额度计算修改' () from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
liyang 65ca417a2e 推广后台资源申请页面
liyang e008e14046 额外额度计算修改
tping fb3bcdd107 1
廖金灵 e84f8c174a Merge pull request '优化' () from feature/testing_quota_up into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
ELF 8a815af691 优化
廖金灵 82d8487bf9 Merge pull request '额外额度备注信息显示' () from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/164
ly 4a69622b01 额外额度备注信息显示
陈志 29be3bf6b8 Merge pull request '优化取消时间导出错误' () from feature/finance_payment_20210115 into release
优化取消时间导出错误
chenzhi c936ee528c 优化取消时间导出错误
廖金灵 e17eeae704 Merge pull request '额外额度、申请批次修改' () from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/162
liyang 769a6974ab 额外额度、申请批次修改
郑永星 84d6d1c145 Merge pull request '2.7号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
zhengyongxing 6dce14520e 2.7号功能提交