elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,738 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

231 Commits (83cc2aa6ec72df1d5be38073ab57111ddae49b67)

Author SHA1 Message Date
ELF 268e084241 修改
ELF 9d67a4c842 优化
ELF 6596e01a29 修改
ELF 32bc839dcd 合并
ELF e0bbec0978 修改
ELF 7614d5feca 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
ELF 296e378501 修改
ELF e4854aca3a 修改
ELF 1a14ed8dc7 修改
elf@home 50755b89c5 修改
ELF cc6c5d4e74 修改
ELF 2867a05bb3 修改
ELF c7390f4c2e bug修复
ELF e249596014 修改
ELF 550da5cb37 测试
ELF 06c4d5f1f1 优化测试资源
ELF fa90dc0bc8 修改
ELF c9cd377d4f 修改
ELF 367345ea8d 修改
ELF ecf460e7c9 修改
ELF 49751b8760 测试资源修改
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
ELF 56282658fc 解决冲突
ELF 0206a422f9 解决冲突
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
zhengyongxing 4c3112b70e 充值信息查看权限添加
ELF 46fc13a91e 修改
ELF 1bec15c186 修改迁移bug
ELF f3b323bda8 修改
yulingwei eaa25ebcda feature/desposit
ELF 096e32d581 商户配置
ELF e8a925b64c 游戏统计添加聚合充值数据
ELF 15d0b454a4 修改
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 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
ELF 2d872ed710 解决冲突
ELF a153fb9a0e 修改
zhengyongxing 9d43914b17 汇总单结算代码上传
ELF 69b09c582f 添加落地页限制规则
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 平台币统计
ELF a06b199068 落地页记录下载日志
ELF b434d2eacc 优化游戏管理
ELF dae2dd5fd9 优化游戏
sunke 0c0b2d2f01 record_PromoteLogs热修复
sunke 1f6de9be57 操作日志
ELF dad83c8d38 押金付款方式添加选项
ELF e58bb1149f 修改落地页授权
ELF 423b4ae77b 解决冲突
ELF bbb31890f6 未收押金会长禁用落地页/下载页
ELF ed25d54dc8 解决冲突
ELF b4d35af3cb 推广员列表显示
liaojinling e596d11cee 会长押金
liaojinling 843a429b43 下载添加部门/小组
liaojinling d789a175f8 推广员/组长添加备注
ELF e8a0975981 解决冲突
ELF b7cf4c28a7 修改
ELF 3af87434b9 权限判断修改
ELF d3a3b8cdb7 修改
ELF 79f9801351 修改落地页/下载页
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
ELF 04fccce6dc 修改上传网络请求限制
ELF e6c891a945 修改
ELF f472f5e9d3 文件保存改成cdn
ELF 91d4c9f753 补链/玩家迁移排除已结算订单（cp结算）
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
修改玩家迁移限制
elf@home e59a2f7350 添加玩家迁移只对同一推广员限制
ELF f1dc5f8920 推广员继承company_id
ELF 87fb1f526e 修改推广员添加时初始默认状态