124 Commits (b4cc294a2834980613ac9e68bd09d8b8a2cb56b2)

Author SHA1 Message Date
万盟天下 48abd2d464 Merge branch 'hotfix/upload_oss' of wmtx/platform into master
修改分包
5 years ago
ELF c871575e23 修改打包失败提示 5 years ago
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
5 years ago
ELF b217695c3f 修改分包oss文件上传 5 years ago
ELF d9cc82f73a 修改网站注册 5 years ago
yulingwei bbc1f6b89a upt 5 years ago
ELF 908722c5be 修改 5 years ago
ELF ed19727f91 修改bug 5 years ago
ELF a0cfee5466 修改 5 years ago
ELF 4a1ffd2955 解决冲突 5 years ago
sunke 9878ba45e5 取消平台转移 5 years ago
sunke e94c64a881 平台币统计 5 years ago
ELF a06b199068 落地页记录下载日志 5 years ago
ELF b434d2eacc 优化游戏管理 5 years ago
ELF dae2dd5fd9 优化游戏 5 years ago
sunke 0c0b2d2f01 record_PromoteLogs热修复 5 years ago
sunke 1f6de9be57 操作日志 5 years ago
ELF dad83c8d38 押金付款方式添加选项 5 years ago
ELF e58bb1149f 修改落地页授权 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF b4d35af3cb 推广员列表显示 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
liaojinling 843a429b43 下载添加部门/小组 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF b7cf4c28a7 修改 5 years ago
ELF 3af87434b9 权限判断修改 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
ELF 79f9801351 修改落地页/下载页 5 years ago
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1 5 years ago
ELF 04fccce6dc 修改上传网络请求限制 5 years ago
ELF e6c891a945 修改 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
ELF 91d4c9f753 补链/玩家迁移排除已结算订单(cp结算) 5 years ago
liuweiwen 0b3ae062b1 优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
5 years ago
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
5 years ago
elf@home e59a2f7350 添加玩家迁移只对同一推广员限制 5 years ago
ELF f1dc5f8920 推广员继承company_id 5 years ago
ELF 87fb1f526e 修改推广员添加时初始默认状态 5 years ago
elf@home 6e354fe3b3 优化链接归属查询 5 years ago
ELF da5e8b9050 修改 5 years ago
liuweiwen 2096c22826 注释 5 years ago
ELF b36e1f1bc9 解决冲突 5 years ago
ELF c90851996c 修改bug 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
ELF bb2996dbee 迁移忽略结算 5 years ago