Commit Graph

3125 Commits (c7a22ce7dd620c8d542fddebe809babeaf4f4dd1)

Author SHA1 Message Date
廖金灵 c7a22ce7dd Merge pull request '特殊补点导出修正' () from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/89
zhengyongxing 7054f82fde 特殊补点导出修正
chenzhi 170895055e 优化重算
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 3a629d63ea 优化结算人
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug
zhengyongxing a641ff2526 上游公司分页修改
tping 8897a87342 甲乙方公司
廖金灵 5c119e2d76 Merge pull request '优化登陆' () from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
chenzhi e6e408845b 优化cw只能登陆子系统
chenzhi 343ecc8587 优化登陆
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
chenzhi 12f4cda850 优化商户筛选
chenzhi 36e9125363 新增测试订单
chenzhi c85e9a831f 优化消息异步
张谷成 79872bbaf7 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
tping 5775e7f02e 优化
chenzhi 14bb68b82e 优化业绩提成
张谷成 83148cd777 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
tping 9f329b7c34 优化
chenzhi df2da60986 优化市场部毛利
张谷成 5410a1cb2e Merge pull request '时间格式' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
tping 98ebb36aa3 时间格式
chenzhi 1b0124606a 优化市场结算脚本
张谷成 049f08af72 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
tping e3f020965d 优化
张谷成 2123ad9ef4 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
tping e57a5f8e50 优化
chenzhi 382f2527a0 优化新增条件
张谷成 a97e94fc21 Merge pull request '1' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
tping ee34cc86f5 1
chenzhi c5bc599289 优化游戏统计
chenzhi 813aebfd64 优化统计
郑永星 c62ad6e69d Merge pull request '12.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
zhengyongxing 9c0006ef45 12.28功能提交
郑永星 a9aca61c73 Merge pull request '12.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
zhengyongxing f855835501 12.28功能提交
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
郑永星 444cff5f64 Merge pull request '12.28功能提交' () from feature/add_item into release
12.28功能提交
zhengyongxing d1b0ec55a8 12.28功能提交
郑永星 1496fa349a Merge pull request '12.28功能提交' () from feature/add_item into release
12.28功能提交
zhengyongxing 0293fd7ff1 12.28功能提交
chenzhi f0829e84cc 优化统计
zhengyongxing bb73235874 12.28功能提交
郑永星 12434fb840 Merge pull request 'feature/add_item' () from feature/add_item into release
12.28功能提交
chenzhi be8a30a2e8 合并
chenzhi b1a34cc9a0 优化不打款汇总
zhengyongxing e84ce56293 12.28功能提交
chenzhi 19f7406298 优化结算