Commit Graph

3863 Commits (c30e396b2ca57baa77ac327cbc966ee051a6b2d1)

Author SHA1 Message Date
zhengyongxing c30e396b2c 未结算数据的补充
zhengyongxing 32abdbb390 汇总统计修改
zhengyongxing f13ee0583c 未结算数据的补充
zhengyongxing a31e3bf1ab 数据授权js错误修正
zhengyongxing 309b195986 12月功能提交
zhengyongxing 23e5632eec 12月功能提交
zhengyongxing f804b7af3f 12份功能提交
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item
zhengyongxing fb0acddb3f 12份功能提交
zhengyongxing af5aad352a 备注bug修改
zhengyongxing ec3491943b 12月功能提交
zhengyongxing 52ff4a2bc6 12月功能提交
zhengyongxing 9bec07c7d4 不结算bug修改
zhengyongxing 747224dae9 12月功能提交
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
zhengyongxing 8bb8e4379f 12月功能提交
zhengyongxing b8af3ea384 12月功能提交
zhengyongxing 7e41ad1e18 12月功能提交
zyx 6b0de87280 未结算接口修改
zhengyongxing 166c1d63d6 12月功能提交
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加
zhengyongxing 10ddadece7 js字符类型修改成数字类型
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
zhengyongxing 923851fea7 11月bug修复
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
chenzhi 943d63faac 优化财务汇总
zhengyongxing 564a2ec91d 11月bug修复
郑永星 3f7c20c3ab Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
zhengyongxing 0e67e37436 11月bug修复
郑永星 e179d507e8 Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
zhengyongxing 0572fde5ad 11bug修复
廖金灵 3e27f09e7d Merge branch 'feature/add_item' of wmtx/platform into master
特殊补点用户名修正
chenzhi a20285a42e 优化是否参与结算导出
zhengyongxing 08dd238ca4 特殊补点用户名修正
chenzhi e7cd32b2a2 优化是否结算参数
廖金灵 bfbac3b30a Merge branch 'feature/add_item' of wmtx/platform into master
汇总刷新接口提交
zhengyongxing ef13761820 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
zhengyongxing d6b8fa208c 汇总刷新接口提交
chenzhi 2890f3e820 优化订单查看
chenzhi 147cac3a9e 优化公会统计
chenzhi b9b497e255 优化公会结算
chenzhi 9ddfb6f794 现在参与结算筛选
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
chenzhi 2d0bba8de5 优化修改推广游戏操作日志
chenzhi 7e1d2fb879 优化日志