Commit Graph

1098 Commits (263937f83e2016be8b40c3f2aced41b7b11be86d)

Author SHA1 Message Date
liuweiwen 9236c4135a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen fb4b017515 导出搜索时间修改
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
tping 127be94d60 充值补单
zhengyongxing 5f4b02b9c5 超级签订单菜单修正
liuweiwen 3244238849 修改文字
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动
直充支出明细多条数据可滚动
chenzhi 34aac60bfa Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 44407cdb89 优化游戏选择公司联动
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 795c1983ad 优化官方渠道没有渠道查看
tping 964eea79e5 1, 平台币补单
2,repair_pay表
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
chenzhi a6ad40b45a 公会统计新增返回按钮
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9549812c41 修复第二页数据不显示问题
zhengyongxing 65e13bbcc5 测试白名单bug修正
zhengyongxing 1922e29542 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 2d63204546 支付渠道统计权限注释
chenzhi 23306ba33b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 4ab8977f06 取消财务管理数据权限
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
chenzhi 9b7f3d1104 优化csv导出默认为不转码
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索
liuweiwen 491f8526bb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen aaabd0a07f 游戏统计搜索时间范围
zhengchanglong bf6a61f41d Merge branch 'release-1.0.0' into dev
liuweiwen b1e9127e9d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 7b87c7718d 游戏统计搜索时间范围
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev
ELF 67dd874ccf 修改
chenzhi 5f70aa78d8 优化补链记录
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Data/update.sql
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev