Commit Graph

8036 Commits (8b13de3e27716798e381f920499f6acac3661a11)
 

Author SHA1 Message Date
廖金灵 8b13de3e27 Merge pull request '添加奖金池总额' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/396
ELF 546abbfa72 添加奖金池总额
廖金灵 11a78d9094 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/395
ELF 23ba2f3d3f Merge branch 'release' of 8.136.139.249:wmtx/platform into release
ELF a2892d0491 Merge branch 'master' of 8.136.139.249:wmtx/platform into release
ELF 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package
ELF 1279cbfe3b 优化
廖金灵 a027f6ad58 Merge pull request '优化首页' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/394
chenzhi b156e22e83 优化首页
廖金灵 49b0ae3f14 Merge pull request '优化登陆' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/393
chenzhi 541c4f47da 优化登陆
廖金灵 ef15ac363a Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/392
chenzhi 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 1263383533 优化内团毛利计算公式
廖金灵 91701f3ecc Merge pull request '修复汇总导出' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
chenzhi d6ea8057f0 修复汇总导出
廖金灵 82a40a79bd Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/388
廖金灵 84a6b21f88 Merge pull request '优化' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
ELF 9fb91c4a66 优化
chenzhi 9abd3896f7 新增提醒
chenzhi 626c63fe89 取消汇总不结算信息
chenzhi 497d3f8f61 优化计算及导出
chenzhi db28185af3 优化毛利统计方式
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi d60330a093 新增商户支付导出
廖金灵 742bb493c1 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/387
ELF 4e1cf805ea 优化
廖金灵 e124f9caf3 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/386
ELF 98c938c814 优化
ELF 78a24c78f5 优化
廖金灵 089b33958e Merge pull request '上游cp新增是否过期查询' () from hotfix/underpay_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/384
陈志 fb86e08f69 Merge pull request 'hotfix/underpay_bug' () from hotfix/underpay_bug into release
上游cp新增是否过期查询
chenzhi 31fa1fcfc2 上游cp新增是否过期查询
廖金灵 839d287bf2 Merge pull request '毛利现在bug打印' () from hotfix/underpay_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/383
chenzhi 24e4f77a98 毛利现在bug打印
陈志 059cc12bcf Merge pull request 'hotfix/underpay_bug' () from hotfix/underpay_bug into release
新增打款确认优化
廖金灵 d28fdfa7cf Merge pull request '新增打款确认优化' () from hotfix/underpay_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/381
chenzhi 4d8e7de144 新增打款确认优化
chenzhi 2d1da379b0 新增生效配置
廖金灵 8afbda9a1a Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/380
陈志 7e1bf58203 Merge pull request 'feature/more_payment' () from feature/more_payment into release
优化导出
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 56fa287357 优化导出
chenzhi 648fb3ebbf 优化内部公司改进
chenzhi 4b1935676b 新增内外团查询
chenzhi e274f863a8 新增内部公司部门查询
廖金灵 a0a1c5635e Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/378
廖金灵 9108b507b7 Merge pull request '优化' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/377
ELF 6d5d40dfd2 优化
廖金灵 91e70828af Merge pull request '优化' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/376