Commit Graph

82 Commits (c0fe59864c401511ff50c06eedbfb9b0a3645815)

Author SHA1 Message Date
ELF 49751b8760 测试资源修改
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
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 15d0b454a4 修改
ELF 990a2bd206 解决冲突
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 2d872ed710 解决冲突
zhengyongxing 9d43914b17 汇总单结算代码上传
ELF 69b09c582f 添加落地页限制规则
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
yulingwei bbc1f6b89a upt
ELF 908722c5be 修改
ELF ed19727f91 修改bug
ELF a0cfee5466 修改
ELF 4a1ffd2955 解决冲突
sunke 9878ba45e5 取消平台转移
sunke e94c64a881 平台币统计
ELF b434d2eacc 优化游戏管理
sunke 0c0b2d2f01 record_PromoteLogs热修复
sunke 1f6de9be57 操作日志
ELF e58bb1149f 修改落地页授权
ELF 423b4ae77b 解决冲突
ELF bbb31890f6 未收押金会长禁用落地页/下载页
liaojinling 843a429b43 下载添加部门/小组
liaojinling d789a175f8 推广员/组长添加备注
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
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 修改推广员添加时初始默认状态
ELF da5e8b9050 修改
liuweiwen 2096c22826 注释
ELF b36e1f1bc9 解决冲突
ELF c90851996c 修改bug
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
ELF bb2996dbee 迁移忽略结算
ELF 289b40329f 添加换绑时金额
liuweiwen 1693f7fa98 推广公司
liuweiwen d51725f1af 新增推广员时,新增推广所属公司
ELF 81a968947b 修改bug
ELF ef60ca85cf 修改
ELF a91a5d5759 修改