Commit Graph

7668 Commits (a4bbe4fe39bb1f9cc3f6b7ac92e5f8188db2d3f1)
 

Author SHA1 Message Date
廖金灵 a4bbe4fe39 Merge pull request '修复' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
liyang a960ed7c0c 修复
廖金灵 1b4fb17d2c Merge pull request 'feature/LY0309' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
liyang da588a3d86 修复
郑永星 77532bdb08 Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
zhengyongxing 97fae33c43 公会信息功能提交
zhengyongxing f69b0ddf14 公会信息功能提交
liyang 42a8fc94f7 角色查询-本推广号
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' () from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
zhengyongxing 22b17c5010 市场业绩系统bug修复
zhengyongxing c06b954bf7 市场业绩bug修复
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
zhengyongxing 7c60d8321b 市场业绩bug修正
liyang 5cd8ca2857 角色查询、额外额外、测试资源权限修改
liyang a457750390 角色查询、额外额度、测试资源权限修改
郑永星 6051f9ee2a Merge pull request '子系统上游修正' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
zhengyongxing 68c873983b 子系统上游修正
陈志 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 优化退款可以负数