Commit Graph

213 Commits (e2bd47ac2d3b941efb4bd805abc560f442eb945e)

Author SHA1 Message Date
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
ELF 46fc13a91e 修改
ELF 1bec15c186 修改迁移bug
ELF 15d0b454a4 修改
ELF 70c9e26ce4 修改bug
ELF 990a2bd206 解决冲突
ELF 102e77267d 修改bug
ELF e94b6418f1 修改
ELF 8224cfb362 修改
ELF 77c692c44d 修改
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
ELF 34691d6baa 修改
ELF 6f2f588617 优化
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
ELF 2d872ed710 解决冲突
ELF a153fb9a0e 修改
zhengyongxing 9d43914b17 汇总单结算代码上传
ELF 69b09c582f 添加落地页限制规则
ELF d5d6c255b0 优化打包
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
万盟天下 f7a0d82314 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改
ELF 4b852cf071 修改
万盟天下 e4be42865b Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改推广平台游戏上下架bug
ELF ce990d3181 修改bug
万盟天下 48abd2d464 Merge branch 'hotfix/upload_oss' of wmtx/platform into master
修改分包
万盟天下 7c0ba028b1 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
优化分包
ELF c871575e23 修改打包失败提示
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
ELF b217695c3f 修改分包oss文件上传
ELF d9cc82f73a 修改网站注册
yulingwei bbc1f6b89a upt
ELF 908722c5be 修改
ELF ed19727f91 修改bug
ELF a0cfee5466 修改
ELF 4a1ffd2955 解决冲突
sunke 9878ba45e5 取消平台转移
sunke e94c64a881 平台币统计
廖金灵 4ee8b21cd5 Merge branch 'feature/mark_repeat_user' of wmtx/platform into release
用户重复标识-注册事件通知
ELF bda92e4e1a 用户重复标识-注册事件通知
ELF a06b199068 落地页记录下载日志
ELF b434d2eacc 优化游戏管理
ELF dae2dd5fd9 优化游戏
sunke 0c0b2d2f01 record_PromoteLogs热修复
sunke 1f6de9be57 操作日志
ELF dad83c8d38 押金付款方式添加选项
ELF e58bb1149f 修改落地页授权
yulingwei e35f20ee70 游戏预警
ELF 423b4ae77b 解决冲突