Commit Graph

7572 Commits (7756efe8599f47849a728f88ef53252375bd488d)
 

Author SHA1 Message Date
廖金灵 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 优化
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
张谷成 5410a1cb2e Merge pull request '时间格式' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
tping 98ebb36aa3 时间格式
廖金灵 72589a4b9e Merge pull request '版本更新v1.3.0' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/60
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 优化
张谷成 5de3b95d54 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
tping b4c3b64fb0 优化
张谷成 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
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
chenzhi c5bc599289 优化游戏统计
zhengyongxing f5e2adb860 短信验证万能验证码注释
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功能提交