Commit Graph

1376 Commits (58c8508ce438c00043dec6fbff6440219dba8203)

Author SHA1 Message Date
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
zhengyongxing 1f0cfca3ce 管理后台推广公司管理及合作方管理部分文字修改
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改
chenzhi 50462e3470 优化合作方必填项
chenzhi e770a00cbb 优化推广公司必填项目
chenzhi 9f7e15caac 优化推广公司检验规则
chenzhi c3f01ede43 推广公司新增信息填写无效修复
zhengyongxing 2933d2d223 管理后台文字修正
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家
chenzhi 6885ec61fc 优化公会统计平台币收回提醒
chenzhi 289b99c293 合作方管理页面文字错误
zhengyongxing 132b601f74 测试资源搜索功能添加
zhengyongxing 878414aeb2 测试资源搜索修正
chenzhi 450ef803d6 合并
chenzhi 0dab114f1e 优化操作提醒
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
廖金灵 3e43b8cb7c Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
chenzhi 14efc9650f 优化银行信息不记录
zhengyongxing 0ca2f2a064 游戏统计导出修改
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 613d60e4a7 数据权限配置修改
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
chenzhi 21a985ae82 聚合财务结算单ok
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
zhengyongxing a9ce0585cc 测试资源配置
chenzhi 2a28cf9008 聚合财务优化权限
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 b698495dbb 游戏统计添加元素修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加
ELF 0af6a53ba7 后台arpu功能优化
zhengyongxing a5554f7fa3 推广员业务配置功能添加
zhengyongxing 295ca2d803 推广员业务配置功能添加
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 322b4b6cee 管理后台导出权限添加
zhengyongxing 001e9e70f8 管理后台导出权限添加
廖金灵 7ab6c8ad68 Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
yulingwei 2ac6f7ebee upt
廖金灵 820885f3dd Merge branch 'feature/platform_rule' 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 0758921bfe 平台
sunke 848eb6c294 平台
sunke b6649a7b9d 平台币
yulingwei ac83e556ff upt
yulingwei f1428a8fe7 upt
sunke 031528411b 平台币
sunke 5fa22cfa40 弹窗
sunke fee97bb00a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
yulingwei e462305587 upt
sunke c1168740b6 平台币
sunke 253c956794 平台币
sunke 2adcb68c06 平台币新增需求
sunke 1fe794b597 平台规则样式优化
sunke bdb688c985 编辑规则
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填
yulingwei c1d03cc526 upt
zhengyongxing 541ec17db5 隐藏威富通添加汇付宝
yulingwei 007374e121 upt
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
sunke 15f6cb19a3 渠道支付顺序
ELF 2a2e5f0d31 添加tf礼包问题
sunke b4e66dcd40 隐藏推广配置
张谷诚 c5af3c29d7 Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正,支付意愿统计功能优化
廖金灵 9f202c3991 Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
chenzhi 9237bc3cc8 优化选择
廖金灵 86a90467ff Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
zhengyongxing d4aafd2983 支付渠道测试订单录入bug修正,支付意愿统计功能优化
yulingwei 6f7d285f9f 修复资源工单完成情况
chenzhi c0df7f23c3 优化高亮
zhengyongxing dc5437d7cb 支付渠道测试订单录入bug修正,支付意愿统计功能优化
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录
chenzhi 5ddf75a600 财务对比ok
chenzhi b2ad4e8b6e 财务对比 v1
chenzhi a2db46d1c0 财务对比首页
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正,支付意愿统计功能优化
chenzhi 79f4719dec 财务对比7
chenzhi c4eb963cfe 财务比对5
zhengyongxing de646044c2 支付渠道详情检索修正
zhengyongxing e7e7df569b 支付渠道统计bug修改
chenzhi 202f9a45d1 财务对比4
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi 33be2ba05b 优化游戏统计平台币直充搜索后数据不符合问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
chenzhi eaa51463e5 公会统计
chenzhi ea69ecb086 财务比较2
张谷诚 13c352a924 Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿a标签悬停变成手势
chenzhi e0c946e67c 工会统计2
chenzhi b36515a720 工会统计
chenzhi 48e5e4d824 财务对比1
zhengyongxing 4361b3c3ba 支付渠道意愿a标签悬停变成手势
廖金灵 d781d6825c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改,及排序方式修正
zhengyongxing 674e727921 支付渠道意愿统计文字修改
张谷诚 170b116333 Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
zhengyongxing 9eff370801 支付渠道意愿统计bug上传
张谷诚 e42281bdfe Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
zhengyongxing f40bd57698 支付渠道意愿统计bug上传
廖金灵 985fdab851 Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
张谷诚 b9f466f73c Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
zhengyongxing f7c9730153 市场结算管理优化
sunke 163ad97d60 支付限额
sunke 817b39c391 支付限额
sunke 56b5144440 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
sunke 68572d10e6 支付限额
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化
sunke ab1c99d95a 时间
sunke dfb83d35d0 时间样式
ELF ef56ea2180 修改
ELF a512fb224e 修改bug
ELF fb6a00859e 修改会长押金需求
sunke 098caeaa90 时间样式
sunke 4f98f9fabe 样式控制
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开
zhengyongxing 4ce89ee670 支付白名单列表功能完善
zhengyongxing 6b8f9a47d0 Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list
zyx fc9fa629ae 游戏充值bug修改
sunke fa70a3c77a 限制规则
zhengyongxing ad08aeeace 支付意向统计代码提交
sunke ac54bb41a4 支付限额导出
sunke 5c8221d9dc 支付限额
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 121fc02f18 推广员内外团归属优化2
chenzhi 55d49e8b4b 优化推广公会列表导出
chenzhi 61d0418340 推广公司管理 修改内外团影响底下
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
chenzhi d7737291ed 暂存1
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
yulingwei c40f5dda26 upt
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
zhengyongxing 87b1b04040 充值财务管理金额保留小数点
廖金灵 4c8cb3c171 Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
sunke fea5f4d2d7 ios
廖金灵 bf80a2d99a Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
yulingwei 132dee220a fix
sunke 7194cd49ae 平台币
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 112134ec93 Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
廖金灵 e8282fc00c Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
zhengyongxing bd181dab51 ip限制白名单页面修改
yulingwei 3415ef8336 修改样式问题
sunke fd815ef5a6 html平台币
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
sunke e94c64a881 平台币统计
廖金灵 3be1bd78ed Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
yulingwei 26f89f3c64 merge
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
zhengyongxing e7aa7885e8 ip限制白名单提示语修改
zhengyongxing 1d27db663a ip限制白名单提示语修改
zhengyongxing 5f815370e8 ip限制白名单提交
sunke 41f6797e97 表格样式
sunke 7da471b6ee 支付时间
yulingwei 4afce87caa upt
yulingwei b56ba0b882 upt
yulingwei 823062c0f6 upt
yulingwei adf11e2b60 upt
yulingwei 175502e384 fix
yulingwei b10717e8b6 upt
chenzhi bfee0578d0 玩家列表新增去重数据栏