Commit Graph

7348 Commits (5ce0be3fe2766cbc86c0f61a72aa50d2b69cd69b)
 

Author SHA1 Message Date
郑永星 5ce0be3fe2 Merge pull request '公会信息登记信息补充' () from feature/add_item into release
公会信息登记信息补充
zhengyongxing 3beeb81063 公会信息登记信息补充
郑永星 fa3943cda4 Merge pull request '公会信息登记信息补充' () from feature/add_item into release
公会信息登记信息补充
zhengyongxing e0430cfb46 公会信息登记信息补充
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' () from feature/add_item into release
公会信息登记信息补充
zhengyongxing f923f4d667 公会信息登记信息补充
陈志 55e29b571c Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into release
优化公式
chenzhi 174219d9d5 优化公式
chenzhi 197e129f04 优化结算比例公式
郑永星 9ed794a56c Merge pull request 'feature/add_item' () from feature/add_item into release
公会信息录入功能添加
zhengyongxing e775701c78 公会信息登记导出补充
zhengyongxing 9fceedd10e 模板下载功能添加
zhengyongxing 07ee17ca1d 公会信息录入功能添加
廖金灵 fa0675ae99 Merge pull request '数据汇总下载超时' () from hotfix/doload_timeout into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/81
廖金灵 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
郑永星 c14c4d291c Merge pull request '市场业绩上月业绩绩效百分比比对' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/77
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对
廖金灵 36416208f2 Merge pull request '特殊补点编辑修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/75
郑永星 4d6cc118f2 Merge pull request '特殊补点编辑修改' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/76
zhengyongxing b073f3e8cd 特殊补点编辑修改
郑永星 ba8e852152 Merge pull request 'feature/add_item' () from feature/add_item into release
特殊补点编辑修改
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
陈志 476a66f77c Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into release
优化结算人
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
廖金灵 7e5b3cfe7f Merge pull request 'hotfix/company_bug' () from hotfix/company_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/70
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 优化