Commit Graph

4105 Commits (ff9ab580c95ecc4a40d4ba697fb1faf10992fdac)

Author SHA1 Message Date
廖金灵 9fdfeb7586 Merge pull request '测试资源修改' () from feature/testing_resource_permission into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/144
chenzhi 8b4814cbf5 优化结算审核
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 修改
郑永星 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功能提交
郑永星 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功能提交
郑永星 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功能提交
tping de31285f85 Merge branch 'release' into feature/0128
tping a865b9d669 文字修改
郑永星 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 导出所有
陈志 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