Commit Graph

4526 Commits (c40f5dda268fa4539de03bf3a06a603a887e7ca3)
 

Author SHA1 Message Date
yulingwei ed9ddd2d67 修复检索问题
yulingwei 5cb129e95f 修复冲突
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev
yulingwei 5542994e36 upt
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
sunke 5969687185 认证限制排除协议
sunke dc03c8a07a 认证限制排除协议
ELF b6500f939d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 247f10447a Merge branch 'feature/account_safe' into dev
ELF 500d0fdc2c 后台管理系统登录后改变session_id
sunke 185327351d 强制认证优化
sunke 015e7bc506 强制资质认证优化
yulingwei 7cbf2118e2 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi 377bdaee72 合并gt
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批
zhengyongxing 4fb2806656 新增市场结算管理
chenxiaojun c8fd6309a7 更新
chenxiaojun f1e8811df3 推广结算--更新
chenzhi 5326ef28db 合并
chenzhi 94243a5ea6 修改update冲突
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
liuweiwen d1c60ed153 新增表sql
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
sunke 9256bda2d0 账号加密
sunke df2919f44b 账号加密
sunke 014c0c8675 玩家账号加密
sunke cbb1436e41 玩家账号加密
万盟天下 63b99ad198 Merge branch 'hotfix/download_cdn' of wmtx/platform into release
修改包下载bug
ELF 5ba071f3d3 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/download_cdn
ELF 74fa3946ec Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 6cdde605cb Merge branch 'hotfix/download_cdn' into dev
万盟天下 257fd19615 Merge branch 'hotfix/download_cdn' of wmtx/platform into master
修改包下载bug
ELF fb64d574cb 修改包下载bug
万盟天下 802c6b02b7 Merge branch 'hotfix/shift-player' of wmtx/platform into master
修改玩家迁移限制
ELF 710ef727e4 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/shift-player
万盟天下 005bcca311 Merge branch 'feature/add_cdn' of wmtx/platform into master
oss 转 cdn
万盟天下 e6d4304d74 Merge branch 'hotfix/shift-player' of wmtx/platform into release
还原补链限制