Commit Graph

104 Commits (ff9ab580c95ecc4a40d4ba697fb1faf10992fdac)

Author SHA1 Message Date
ELF a355c2b579 优化
elf@home 23643d2e0b 修改
ELF 874ba3a705 修改i哎
ELF 0aa3c514d7 优化
ELF 531b94bae8 版本
elf@home 34e25f293a 推广员添加每级id
ELF 1b74318619 修改
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF f95125892a 优化推广员后台汇总查询
ELF 7468057834 推广员结算订单归属
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
ELF 8c8d01a446 修改评级
ELF ca99068a0e 修改
ELF 268ea4e34d 修改
ELF 6fcaa1362c 重置权限缓存
ELF 9d67a4c842 优化
ELF 32bc839dcd 合并
ELF 1a14ed8dc7 修改
elf@home 50755b89c5 修改
ELF e249596014 修改
ELF ecf460e7c9 修改
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 未收押金会长禁用落地页/下载页