52 Commits (6ea7a581f581ffe78cdf9a60d2b7cd2b48a1e753)

Author SHA1 Message Date
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release 5 years ago
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1 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 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 81a968947b 修改bug 5 years ago
ELF ef60ca85cf 修改 5 years ago
ELF a91a5d5759 修改 5 years ago
ELF 128c11f5b8 修改 5 years ago
ELF 25fa79ea55 修改玩家迁移 5 years ago
sunke 401edecd61 target_level 5 years ago
sunke 8951a502c2 修改bug 5 years ago
sunke 94bede9a41 平台币修改 5 years ago
sunke c3caed08b3 bug 5 years ago
ELF 6cdee448c0 修改bug 5 years ago
ELF 1bffd62357 修改bug 5 years ago
ELF 1a0175e583 修改结构 5 years ago
ELF e56256ba1d 修改bug 5 years ago
ELF c4d35c26d4 修改bug 5 years ago
ELF 85e466c3fd 修改bug 5 years ago
ELF e27c5a5266 修改bug 5 years ago
ELF b2df7e0fe3 修改bug 5 years ago
ELF fbce375679 修改bug 5 years ago
ELF 3d46a55811 修改bug 5 years ago
ELF c88892ec59 修改 5 years ago
ELF 784de48bf9 修改bug 5 years ago
ELF c2c8f11d01 修改 5 years ago
ELF 070cc2e7c2 修改bug 5 years ago
ELF edc6a7be73 修改冲突 5 years ago
ELF 9abb4ebb2c 修改 5 years ago
chenzhi 7e37f3a2df 优化迁移用户addshifttask 5 years ago
ELF f056143dee 修改bug 5 years ago
ELF 08774a0954 完善添加推广员 5 years ago
ELF fc89281a48 3级变4级修改 5 years ago
ELF edc40b8a1b ss 5 years ago
ELF 689cc08b69 修改 5 years ago
ELF 22dcca566b 修改 5 years ago
ELF 5b62b99765 三级变四级 5 years ago