Commit Graph

7699 Commits (69301ee53743747c41cc9c6d1cb962cd501d4505)
 

Author SHA1 Message Date
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 修改名词
廖金灵 1b71dbbe1c Merge pull request '优化打款系统登陆' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/143
chenzhi a10174b3e6 优化打款系统登陆
廖金灵 dd488d4ff5 Merge pull request '优化结算审核' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/142
chenzhi 8b4814cbf5 优化结算审核
廖金灵 ee669a0409 Merge pull request '优化' () from feature/testing_resource_permission into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/141
ELF 2ecaa742d5 优化
廖金灵 9199b4c9a8 Merge pull request '优化' () from feature/testing_resource_permission into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/140
ELF a355c2b579 优化
廖金灵 4005f70094 Merge pull request '测试资源跨部门申请资源' () from feature/testing_resource_permission into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/139
廖金灵 b6412dd9c7 Merge pull request '市场业绩脚本修正' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/138
廖金灵 e4da7b8b99 Merge pull request '市场业绩脚本修正' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/137
zhengyongxing 3e363d65d5 市场业绩脚本修正
廖金灵 49bc231e92 Merge pull request '工会统计bug修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/135
郑永星 2dd945613f Merge pull request '工会统计bug修改' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/136
zhengyongxing 735823d792 工会统计bug修改
elf@home 23643d2e0b 修改
廖金灵 95139b4fe9 Merge pull request '版本更新v1.4.0' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/134
廖金灵 ea21c1ee49 Merge pull request '修改i哎' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
ELF 874ba3a705 修改i哎
廖金灵 a217127548 Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/132
ELF 91996da3a2 优化
郑永星 42550a32fb Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
zhengyongxing 199b5e0f51 1.28功能提交
郑永星 5c5fc23210 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/130
zhengyongxing cd1f84fb37 1.28功能提交
廖金灵 9af9edef0a Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
ELF a3d3b5722c 优化
郑永星 a5ed9cf3cf Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/128
zhengyongxing a1c809d7eb 1.28功能提交
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
zhengyongxing 338c0369d1 1.28功能提交
郑永星 8d9ca939d6 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
zhengyongxing 25ec474c1c 1.28功能提交