149 Commits (a1c3ad8fb3b390a7652558afd9a342054fb8f96c)

Author SHA1 Message Date
ELF d3a3b8cdb7 修改 5 years ago
ELF c01b0f1083 发送短信添加ip地址 5 years ago
ELF afa7aa8988 修改短信服务bug 5 years ago
ELF f6eb5d8008 修改bug 5 years ago
ELF e4daff1be8 修改短信接口 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
ELF 289b40329f 添加换绑时金额 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liaojinling c637a8bfe0 打包 5 years ago
ELF 81a968947b 修改bug 5 years ago
liaojinling d5dc2396f2 修改 5 years ago
liaojinling ca4f1954e4 修改bug 5 years ago
liaojinling 1204b1a0e8 修改 5 years ago
liaojinling fe6dd1ddff 改成旧的打包方式 5 years ago
ELF ef60ca85cf 修改 5 years ago
ELF a91a5d5759 修改 5 years ago
ELF 128c11f5b8 修改 5 years ago
ELF 25fa79ea55 修改玩家迁移 5 years ago
ELF 4fc5b08289 修改 5 years ago
ELF 1f167778a7 调试 5 years ago
ELF 88385b2f87 调试 5 years ago
ELF 1e976d620b 调试 5 years ago
ELF b08c7748c9 调试 5 years ago
ELF 494098abc1 修改分包 5 years ago
elf@home 8d6c547468 支持分片文件上传 5 years ago
chenxiaojun efb4a771b0 推广平台->数据管理->每日概况|数据汇总--更新 5 years ago
chenxiaojun 98fe853743 推广平台->数据管理--更新 5 years ago
chenxiaojun 80f76c4490 推广平台->数据管理--更新 5 years ago
ELF 112d7462bc 修改bug 5 years ago
ELF 5a98b86a07 修改bug 5 years ago