Commit Graph

6482 Commits (97e9a1328e289893158abc6351fb441c512713f0)

Author SHA1 Message Date
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 优化测试统计导出
chenzhi 4e5f6a664d 更新bug
陈志 a9e53ea354 Merge pull request '新增线上线下结算统计' () from feature/finance_payment_20210115 into release
新增线上线下结算统计
张谷成 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
tping 792508bd64 1
tping e5b6af3771 1
chenzhi e2882cc5aa 新增线上线下结算统计
tping d14cb334af Merge branch 'release' into feature/0207zgc
tping fbf0b27ca3 推广后台充值导出
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 修改名词
chenzhi a10174b3e6 优化打款系统登陆
chenzhi 8b4814cbf5 优化结算审核
ELF 2ecaa742d5 优化
ELF a355c2b579 优化
廖金灵 b6412dd9c7 Merge pull request '市场业绩脚本修正' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/138
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
zhengyongxing 735823d792 工会统计bug修改
elf@home 23643d2e0b 修改
廖金灵 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功能提交
郑永星 e9be27136f Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
zhengyongxing 77f7eda10f 1.28功能提交
廖金灵 dcbc152712 Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
ELF 4f3c21263d 优化
陈志 dcb2e68346 Merge pull request '优化提示' () from feature/finance_payment_20210115 into release
优化提示
chenzhi 3947f12f54 优化提示
陈志 b9f83d7f15 Merge pull request '优化打款信息' () from feature/finance_payment_20210115 into release
优化打款信息
chenzhi 9a0ba40d6d 优化打款信息
tping 6ed8fee113 1
tping de31285f85 Merge branch 'release' into feature/0128
tping a865b9d669 文字修改
zhengyongxing 88fc0e2926 1.28功能提交
郑永星 e1a05cb9fe Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/120
zhengyongxing 45ed2e7f16 1.28功能提交
郑永星 272eca3f9a Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
zhengyongxing 7a2e4d9033 1.28功能提交
郑永星 e4fb38e5f7 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/118
zhengyongxing 3c1a7a2e61 1.28功能提交
郑永星 154c0989c8 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/117
zhengyongxing 7e4f8ca78d 1.28功能提交
郑永星 5a232e6bb6 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
zhengyongxing 3c566fb2ae 1.28功能提交
tping c59b8d1419 导出所有
tping cfd4368fe5 1
tping 5c22a252a3 Merge branch 'release' into feature/0128
tping a5b977aa00 导出所有
廖金灵 7194d5a945 Merge pull request '优化' () from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
ELF 0aa3c514d7 优化
陈志 14ba644fda Merge pull request '优化提醒名词' () from feature/testing_daily_count into release
Re优化提醒名词
chenzhi 9d9ef7a79b 优化提醒名词
陈志 98f9c61104 Merge pull request '优化排序' () from feature/testing_daily_count into release
优化排序
chenzhi 746388dd00 优化排序
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release
优化菜单适配
chenzhi 3f88e7dc6f 优化菜单适配
chenzhi b19853edd3 优化菜单
zhengyongxing 8a49578cc4 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item
zhengyongxing 104051d90f 1.28功能提交
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' () from feature/testing_daily_count into release
优化首页提醒
chenzhi 13d0c6fa59 优化首页提醒
zhengyongxing c7730d5d06 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item
ELF 9e68e40200 解决冲突
chenzhi 2658c50c3a 新增测试资源统计
ELF 531b94bae8 版本
郑永星 f4bb1cc5e2 Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
zhengyongxing f710113820 1.28功能提交
郑永星 fec6edf48c Merge pull request '1.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
zhengyongxing 14be887ebb 1.28功能提交
郑永星 747082fc0d 1.28功能提交
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
zhengyongxing ee463829d2 1.28功能提交
chenzhi 2e2ff8e1d7 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 027c803343 优化打款备注