Commit Graph

4523 Commits (88c70c29db3d5caeae27fd7382c3892c894887e1)

Author SHA1 Message Date
chenzhi 6c4319cfe2 Revert "暂存"
This reverts commit a685c14e23.
chenzhi 42a17754e4 修改查看
zhengyongxing 8746d68493 cp下游接口添加
chenzhi c886b508f9 Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
chenzhi bb995ab355 合并
chenzhi a685c14e23 暂存
廖金灵 e39ab6806e Merge branch 'fix/admin_second_optimization' of wmtx/platform into release
bug修复及cp合作方获取接口添加
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization
ELF c871575e23 修改打包失败提示
zhengyongxing c10e05e688 cp合作方获取接口添加
chenzhi ec4d180287 优化公会更改
chenzhi 09e71420e0 优化推广员归属审核
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
chenzhi 5ebdda1c85 修改合作方可为空
zhengyongxing 1f0cfca3ce 管理后台推广公司管理及合作方管理部分文字修改
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改
chenzhi 50462e3470 优化合作方必填项
chenzhi e770a00cbb 优化推广公司必填项目
chenzhi 9f7e15caac 优化推广公司检验规则
chenzhi c3f01ede43 推广公司新增信息填写无效修复
zhengyongxing 2933d2d223 管理后台文字修正
chenzhi 5deb4a798b 隐藏超级签入口
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家
chenzhi 673e3fb5cd 角色权限修改状态提醒优化
chenzhi 6885ec61fc 优化公会统计平台币收回提醒
chenzhi 289b99c293 合作方管理页面文字错误
chenzhi c93a8577c4 合并
张谷诚 bb833deb98 Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
chenzhi ae4c58b6fd 修改推广员流水可选填
zhengyongxing 132b601f74 测试资源搜索功能添加
zhengyongxing 878414aeb2 测试资源搜索修正
张谷诚 c5f9a25a9e Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
zyx ee9f53ce0b 导出权限bug修改
zhengyongxing 301a5a7f5a 导出bug修改
zhengyongxing 5e71728097 导出bug修改
chenzhi 450ef803d6 合并
chenzhi 3e7778df35 优化零元问题
chenzhi 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
廖金灵 52b483356d Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计bug修改
zhengyongxing 6081e088db 游戏统计bug修改
chenzhi 0dab114f1e 优化操作提醒
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
廖金灵 5d0b9d65ed Merge branch 'feature/ylw-4-27' of wmtx/platform into release
市场专员新增合作团队可自动匹配到市场总监
廖金灵 3e43b8cb7c Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
chenzhi 14efc9650f 优化银行信息不记录
zhengyongxing 1659c55ef2 用户行为日志修改
zhengyongxing 0ca2f2a064 游戏统计导出修改
chenzhi 2ad89c2fb6 优化导出时间
chenzhi 5a9fc76374 申请编辑信息遮罩不关闭
zhengyongxing 4d43e877a1 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
zhengyongxing acaebe0217 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
zhengyongxing 60c0c8ee39 Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
 Conflicts:
	Data/update.sql
chenzhi 22dc7a62ce 优化游戏统计导出游戏类型不识别
chenzhi 496d6a27bb 优化推广员选择后驻留问题
chenzhi 7fa6baf860 玩家登陆显示优化
zhengyongxing c58cdd31af 用户行为日志导出修正
zhengyongxing 613d60e4a7 数据权限配置修改
zhengyongxing 057a51dbeb 游戏统计bug修正
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
zhengyongxing 81bd79ecf8 游戏统计bug修正
chenzhi 973f7ca394 现在权限不验证
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
zhengyongxing 4b63c7b786 游戏统计bug修正
chenzhi 21a985ae82 聚合财务结算单ok
zhengyongxing 4f88cd025e 绑币导出修正
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 38f478d63d 数据调整修改
zhengyongxing 8d7dbe5469 测试资源修改
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
zhengyongxing 5dbd0eb8fa 业绩配置修改
zhengyongxing a9ce0585cc 测试资源配置
chenzhi 2a28cf9008 聚合财务优化权限
zhengyongxing 014c7541f3 落地页下载页面更新行为日志
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
chenzhi fe662ce160 审核子操作ok
zhengyongxing b6b97c130d 测试资源代码修正
chenzhi 16d9813e18 聚合财务重算
zhengyongxing a9e6dafad3 行为日志修正
zhengyongxing b698495dbb 游戏统计添加元素修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi afd362d847 聚合结算单导出优化3
chenzhi 2fc38b25b6 聚合结算单导出优化2
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
ELF 4a92ab8543 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/web_register
zhengyongxing 13232b3b04 获取用户账号接口
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
ELF b217695c3f 修改分包oss文件上传
ELF d9cc82f73a 修改网站注册
chenzhi 73ac725950 聚合脚本ok
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加
chenzhi 95cd9993e2 聚合财务1
zhengyongxing 941f27e2e3 获取用户账号的方法添加
yulingwei bbc1f6b89a upt
万盟天下 744cbcf7ea Merge branch 'hotfix/promote_game_bug' of wmtx/platform into master
修改游戏列表bug
万盟天下 53269d56e9 Merge branch 'hotfix/promote_game_bug' of wmtx/platform into release
修改游戏列表bug
zhengyongxing 4d938b85f4 导出账号权限修改配置
ELF 99ac9965d9 修改bug
ELF a56d861053 修改游戏列表bug
zhengyongxing 0482836a8e 导出账号权限添加
ELF ccfd01f70a 隐藏推广员指标
zhengyongxing a5554f7fa3 推广员业务配置功能添加
zhengyongxing 295ca2d803 推广员业务配置功能添加
万盟天下 aa663b3c02 Merge branch 'release' of wmtx/platform into master
优化游戏管理
ELF 144e4e4ea7 计算ARPU
万盟天下 c292e9ed6c Merge branch 'feature/promote_all_check' of wmtx/platform into release
推广员游戏列表查看全选问题修正
ELF 234d297272 恢复大笑隐藏
ELF 4070302a7e 修改bug
ELF 908722c5be 修改
ELF d09e06115f 大笑游戏名称修改
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 322b4b6cee 管理后台导出权限添加
zhengyongxing 001e9e70f8 管理后台导出权限添加
廖金灵 a6dffecaf9 Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复统计问题
yulingwei 8fc1199e79 upt
yulingwei 70f3da8017 upt
廖金灵 7ab6c8ad68 Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
yulingwei 2ac6f7ebee upt
yulingwei c3cb357e1c upt
廖金灵 ea301e6ea5 Merge branch 'feature/ios_Download' of wmtx/platform into release
删除渲染文本
廖金灵 b09ccfc42d Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
yulingwei 872a76356d upt
sunke 9af4931a48 日志
sunke 8114e691d2 ios 统计
廖金灵 93a6e94075 Merge branch 'feature/ios_Download' of wmtx/platform into release
ios下载新增统计
廖金灵 820885f3dd Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
廖金灵 431bb24f32 Merge branch 'feature/president_modify' of wmtx/platform into release
落地页超级签注册添加设备识别
ELF a7173d9ec4 落地页超级签注册添加设备识别
廖金灵 084ea5b11f Merge branch 'feature/pfcoin_data' of wmtx/platform into release
平台币统计新增需求
廖金灵 03722c4825 Merge branch 'hotfix/sumary_download' of wmtx/platform into release
汇总导出
sunke bde08adcc2 平台币
廖金灵 8b2ae9d6da Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
廖金灵 72d1d2f338 Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
sunke 163388e75c 平台币
sunke ae0e10166a pt
sunke 07c385e561 平台
sunke 0758921bfe 平台
sunke aa14aa95a6 平台