Commit Graph

7799 Commits (5107fb9b326b4fe19dcca95af47ca2b81785e5bc)
 

Author SHA1 Message Date
廖金灵 9b9e1871a7 Merge pull request '子系统升级' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/218
陈志 b4277c2276 Merge pull request '优化订单换绑到江息' () from feature/finance_payment_20210115 into release
优化订单换绑到江息
chenzhi c2303a0676 优化订单换绑到江息
郑永星 c754037b79 Merge pull request '财务子系统bug修改' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
zhengyongxing 2f9a822583 财务子系统bug修改
陈志 46c1cb615b Merge pull request '优化子站列表' () from feature/finance_payment_20210115 into release
优化子站列表
chenzhi 4f14228bab 优化子站列表
陈志 4e33c653f6 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
优化结算同步
chenzhi a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309
chenzhi 1b7dae2603 优化结算同步
chenzhi c21b9f619e 新增子站结算
郑永星 cb48948abe Merge pull request '3.22功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/210
zhengyongxing 0332b591e8 3.22功能提交
chenzhi 8d871290f2 优化默认公司
郑永星 7df5d12747 Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/206
zhengyongxing 748f99f758 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item
zhengyongxing eb8c9cebc1 3.22好功能提交
chenzhi 50363297e8 优化订单数据换绑
chenzhi f670c7196a 优化提示
chenzhi 6790ab5fd3 新增订单重算及固化
chenzhi 1de381bccd 优化是否结算
chenzhi bb10181cc5 新增子站游戏订单及导出
chenzhi 8b98460242 新增备注
chenzhi 17cee767b7 子站同步脚本
廖金灵 5d08b3aeea Merge pull request '财务打款系统bug修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/205
zhengyongxing fd34d63730 财务打款系统bug修复
liyang f8b93616ce 菜单封装中
廖金灵 544f03d9c0 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/204
chenzhi 3ee0dbcaa6 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 59d1e31119 优化退款可以负数
廖金灵 d47668b419 Merge pull request '优化重算' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/203
chenzhi 7ed2855dc5 优化重算
廖金灵 2f284281dc Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/202
chenzhi 708707a15a Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi e7a51c41da 优化前端入口文件
廖金灵 f3a01c4c37 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/201
chenzhi 5f3c726a05 优化游戏统计合计
chenzhi 243dce02ca 优化聚合万盟数据
廖金灵 57bf0929b3 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/199
chenzhi aa99f1f668 新增审核撤回
chenzhi 88d02f7be1 优化导出提醒-zyx
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
zhengyongxing 3900a4081a 财务子系统bug修复
zhengyongxing ae3ad391fd 新功能开发
廖金灵 96c6a47dd5 Merge pull request '热更修复' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
zhengyongxing a84a69fd56 热更修复
郑永星 3eb6fbad4d Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/196
廖金灵 e678cc55f8 Merge pull request '修复苹果落地页无法滚动bug' () from hotfix/landing-ios-fixed into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/195
ELF 1ab1db12ab 修复苹果落地页无法滚动bug