Commit Graph

408 Commits (5532c1f690771cb9d50a2f08e2ce9a0d89b755f1)

Author SHA1 Message Date
ELF c8f082cee8 优化显示
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF f95125892a 优化推广员后台汇总查询
ELF 7468057834 推广员结算订单归属
ELF a0f57749c4 优化当前域名获取
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
ELF 89332c0d54 解决冲突
ELF c550846454 修改
ELF 977cfcba3c 修改
ELF c20d071817 修改
ELF 40123f8c50 修改
ELF 530dded4e7 优化
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF 3a6b912399 优化
ELF afc95791d2 优化
ELF 1f3eaa06da 修改
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
ELF dd71ccdf83 修改
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
ELF 34586b228e 修改
ELF 8c8d01a446 修改评级
ELF 3a4fb51222 修改支付商户规则bug
ELF 65c5a221fc 修改
ELF b44a5118cf 修改
ELF 36c240c608 修改
ELF a10bb888da 修改bug
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
ELF 2ae89b9edb 解决冲突
ELF 9b11202deb 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF ca99068a0e 修改
ELF 19c782b053 解决冲突
ELF 268ea4e34d 修改
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
ELF 6fcaa1362c 重置权限缓存
ELF 6da122550c 优化
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 3c698adba9 上游导出修正
ELF 16122d5d9f 修改
chenzhi f169d65c1c 优化推广公司添加排序
ELF 050eb98843 xiugai
ELF 2c9092273f 修改
elf@home 1dd594f46f 修改bug
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 268e084241 修改
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
ELF 9d67a4c842 优化
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 6596e01a29 修改
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
ELF 6e2fda1e26 解决冲突
ELF 32bc839dcd 合并
ELF e0bbec0978 修改
ELF 7614d5feca 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
ELF 296e378501 修改
ELF e4854aca3a 修改
ELF 1a14ed8dc7 修改
ELF 7adabb54f9 修改
elf@home 50755b89c5 修改
ELF cc6c5d4e74 修改
ELF 2867a05bb3 修改
ELF c7390f4c2e bug修复
ELF e249596014 修改
ELF 550da5cb37 测试
ELF 06c4d5f1f1 优化测试资源
zhengyongxing b5e49e850d 上下游聚合打款信息修改
ELF fa90dc0bc8 修改
ELF c9cd377d4f 修改
ELF 367345ea8d 修改
ELF ecf460e7c9 修改
ELF 9c59ba06e2 修改
zhengyongxing 62f4ce3362 上下游聚合打款信息修改
ELF 3383b3d2d9 修改
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 70c9e26ce4 修改bug
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 6f2f588617 优化
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
ELF 2d872ed710 解决冲突
ELF a153fb9a0e 修改
zhengyongxing 9d43914b17 汇总单结算代码上传
ELF 69b09c582f 添加落地页限制规则
ELF d5d6c255b0 优化打包
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 平台币统计
廖金灵 4ee8b21cd5 Merge branch 'feature/mark_repeat_user' of wmtx/platform into release
用户重复标识-注册事件通知
ELF bda92e4e1a 用户重复标识-注册事件通知
ELF a06b199068 落地页记录下载日志
ELF b434d2eacc 优化游戏管理
ELF dae2dd5fd9 优化游戏
sunke 0c0b2d2f01 record_PromoteLogs热修复
sunke 1f6de9be57 操作日志
ELF dad83c8d38 押金付款方式添加选项
ELF e58bb1149f 修改落地页授权
yulingwei e35f20ee70 游戏预警
ELF 423b4ae77b 解决冲突
ELF bbb31890f6 未收押金会长禁用落地页/下载页
ELF ed25d54dc8 解决冲突
ELF 501b8099d4 解决冲突
ELF b4d35af3cb 推广员列表显示
chenxiaojun e48056686d 推广平台>数据管理--新增推广员指标