Commit Graph

7532 Commits (e84f8c174a7fcfcd2de81eb8093531727f242a20)
 

Author SHA1 Message Date
廖金灵 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号功能提交
郑永星 2a3446b56c Merge pull request '2.7号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/159
zhengyongxing 92d6f504e8 2.7号功能提交
郑永星 4e6e402f71 Merge pull request '2.7号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
zhengyongxing 347facea89 2.7号功能提交
郑永星 bf2851b11d Merge pull request '2.7号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
zhengyongxing fec3c76ac1 2.7号功能提交
郑永星 b060f3302d Merge pull request '2.7号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/156
zhengyongxing b2231ff63b 2.7号功能提交
陈志 4adfc5389c Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
移除个人导出打款状态
chenzhi 3997bc4b17 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 2f90e19f1f 移除个人导出打款状态
chenzhi b592554501 Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
陈志 9b3b982df7 Merge pull request '优化所属会长判断' () from feature/testing_daily_count into release
优化所属会长判断
chenzhi d7a787c0fc 优化所属会长判断
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' () from feature/add_item into release
2.7号功能提交
zhengyongxing 53ba2c7698 2.7号功能提交
陈志 a28c71ecb8 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release
优化测试统计导出
chenzhi 290b48dc3b 优化测试统计导出
廖金灵 dac66eaf78 Merge pull request '更新bug' () from hotfix/payment_bug_0203 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/151
chenzhi 4e5f6a664d 更新bug
陈志 a9e53ea354 Merge pull request '新增线上线下结算统计' () from feature/finance_payment_20210115 into release
新增线上线下结算统计
廖金灵 ff9ab580c9 Merge pull request '修改推广后台订单查询bug' () from hotfix/0203 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/149
张谷成 76f6c77160 Merge pull request '1' () from hotfix/0203 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/148
tping f3efd97a19 1
ELF b715e5c07e Merge branch 'hotfix/0203' into release
tping 792508bd64 1
tping e5b6af3771 1
chenzhi e2882cc5aa 新增线上线下结算统计
张谷成 ef4f69b359 Merge pull request 'feature/0207zgc' () from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/146
tping d14cb334af Merge branch 'release' into feature/0207zgc
tping fbf0b27ca3 推广后台充值导出
陈志 fca978ae2c Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
优化公会统计说明
chenzhi 7869d734ef Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 9cfe8abe68 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 4a80ee2f87 优化公会统计说明
廖金灵 9fdfeb7586 Merge pull request '测试资源修改' () from feature/testing_resource_permission into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/144
chenzhi 35c25119e4 优化管理后台线下打款合计字段
chenzhi fa514335cd 统一打款系统统计
chenzhi 0c54e6ecb7 新增汇总单号查找
chenzhi 926b8975f1 修改名词