elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,705 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3ad0d447d4'
${ noResults }
Commit Graph

76 Commits (3ad0d447d4f84843688bd7b54fb756eac28d7153)

Author SHA1 Message Date
ELF 1bec15c186 修改迁移bug 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
ELF 77c692c44d 修改 4 years ago
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
 4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
 4 years ago
ELF 2d872ed710 解决冲突 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
ELF 69b09c582f 添加落地页限制规则 4 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 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 b434d2eacc 优化游戏管理 5 years ago
sunke 0c0b2d2f01 record_PromoteLogs热修复 5 years ago
sunke 1f6de9be57 操作日志 5 years ago
ELF e58bb1149f 修改落地页授权 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
liaojinling 843a429b43 下载添加部门/小组 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
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