225 Commits (cc6c5d4e74e0c0e2bce655addb36f0ba3668cc74)

Author SHA1 Message Date
ELF cc6c5d4e74 修改 4 years ago
ELF 2867a05bb3 修改 4 years ago
ELF edb090feca 解决冲突 4 years ago
ELF 004b540a63 解决冲突 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
ELF 56282658fc 解决冲突 4 years ago
ELF 0206a422f9 解决冲突 4 years ago
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign 4 years ago
zhengyongxing 4c3112b70e 充值信息查看权限添加 4 years ago
ELF 46fc13a91e 修改 4 years ago
ELF 1bec15c186 修改迁移bug 5 years ago
ELF f3b323bda8 修改 5 years ago
yulingwei eaa25ebcda feature/desposit 5 years ago
ELF 096e32d581 商户配置 5 years ago
ELF e8a925b64c 游戏统计添加聚合充值数据 5 years ago
ELF 15d0b454a4 修改 5 years ago
ELF 70c9e26ce4 修改bug 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
ELF 102e77267d 修改bug 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 5 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
5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
ELF 34691d6baa 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
ELF 2d872ed710 解决冲突 5 years ago
ELF a153fb9a0e 修改 5 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 5 years ago
ELF 69b09c582f 添加落地页限制规则 5 years ago
ELF d5d6c255b0 优化打包 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
万盟天下 f7a0d82314 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改
5 years ago
ELF 4b852cf071 修改 5 years ago
万盟天下 e4be42865b Merge branch 'hotfix/upload_oss' of wmtx/platform into release
修改推广平台游戏上下架bug
5 years ago
ELF ce990d3181 修改bug 5 years ago
万盟天下 48abd2d464 Merge branch 'hotfix/upload_oss' of wmtx/platform into master
修改分包
5 years ago
万盟天下 7c0ba028b1 Merge branch 'hotfix/upload_oss' of wmtx/platform into release
优化分包
5 years ago
ELF c871575e23 修改打包失败提示 5 years ago
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
5 years ago
ELF b217695c3f 修改分包oss文件上传 5 years ago
ELF d9cc82f73a 修改网站注册 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