Commit Graph

7343 Commits (34e25f293a18507f1c4a53cac01de1e1253a3451)
 

Author SHA1 Message Date
elf@home 34e25f293a 推广员添加每级id
廖金灵 1c150f290e Merge pull request '剑破长空测试资源' () from feature/jpck into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/99
ELF d08df7feba 修改
ELF 07c95d2ea7 剑破长空测试资源
廖金灵 9febac4e43 Merge pull request '奖惩限制逻辑修改' () from hotfix/reward_limit into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/95
zhengyongxing 508f4abef1 奖惩限制逻辑修改
zhengyongxing 963e806218 奖惩限制逻辑修改
廖金灵 603f56550e Merge pull request '奖惩先去除限制逻辑' () from hotfix/rewardlimit into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/92
zhengyongxing 2366a215a2 奖惩先去除限制逻辑
廖金灵 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 特殊补点导出修正
廖金灵 e2c69406ad 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/84
chenzhi 174219d9d5 优化公式
chenzhi 197e129f04 优化结算比例公式
廖金灵 db5d4cf7ef Merge pull request '修改下载超时' () from hotfix/doload_timeout into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/80
ELF 3dfc92ecc3 修改下载超时
廖金灵 468a5ab162 Merge pull request '优化重算' () from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/79
chenzhi 170895055e 优化重算
廖金灵 84e1b5c0f3 Merge pull request '市场业绩上月业绩绩效百分比比对' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/78
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对
廖金灵 36416208f2 Merge pull request '特殊补点编辑修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/75
zhengyongxing b073f3e8cd 特殊补点编辑修改
zhengyongxing fecb58efdd 特殊补点编辑修改
廖金灵 2e21b124b7 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/73
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 3a629d63ea 优化结算人
廖金灵 34d778f4ce Merge pull request 'hotfix/company_bug' () from hotfix/company_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/71
tping 09076be22b Merge branch 'release' into hotfix/company_bug
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug
zhengyongxing a641ff2526 上游公司分页修改
tping 90045b140d Merge branch 'hotfix/company_bug' into release
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 8323fafd30 优化只读账号
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 优化商户筛选
陈志 55fc77e3ec Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into release
分帐
chenzhi 36e9125363 新增测试订单
chenzhi 96c937b7d3 优化日志
chenzhi c85e9a831f 优化消息异步
廖金灵 2dfa7b2f76 Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/65
张谷成 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 优化市场部毛利
廖金灵 919875c69c Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/62