elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,636 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

2820 Commits (e0d74cbffd65226f5db470c67aa186e00bd1b4d5)

Author SHA1 Message Date
zhengyongxing 2fab9d3ef9 支付渠道详情统计bug修改
zhengyongxing 45847a8194 支付渠道详情统计bug修改
zhengyongxing e51cad19eb Merge remote-tracking branch 'origin/hotfix/finance_game_name_change_2' into hotfix/finance_game_name_change_2
zhengyongxing e7e7df569b 支付渠道统计bug修改
chenzhi 6abef9385e 优化测试服订单导出
chenzhi 202f9a45d1 财务对比4
zhengyongxing e34c553358 支付渠道统计bug修改
zhengyongxing 8d742886a7 支付渠道统计bug修改
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi 33be2ba05b 优化游戏统计平台币直充搜索后数据不符合问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
chenzhi eaa51463e5 公会统计
chenzhi ea69ecb086 财务比较2
zhengyongxing a7838bb552 Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
zhengyongxing e445108eb6 支付渠道统计修改
张谷诚 13c352a924 Merge branch 'feature/pay_white_list' of wmtx/platform into release 
支付渠道意愿a标签悬停变成手势
chenzhi c45ca2942d 优化设备名称函数
chenzhi 6f7e0de83d 优化平台币设备，名称
chenzhi 6c8f935170 支付渠道
chenzhi 751357feef 优化导出
chenzhi e0c946e67c 工会统计2
chenzhi b36515a720 工会统计
chenzhi 48e5e4d824 财务对比1
chenzhi ce1d15c602 优化游戏订单导出
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 d31f5c8691 位数
sunke 55316d475f 限额
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 19af71ce72 支付限额
sunke 68572d10e6 支付限额
sunke a30317be91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
chenzhi 2401acb9a0 优化公会统计bug
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 c8b3cb87d8 支付限额
sunke ac54bb41a4 支付限额导出
sunke 5c8221d9dc 支付限额
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 121fc02f18 推广员内外团归属优化2
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化
chenzhi 55d49e8b4b 优化推广公会列表导出
ELF 4a1ffd2955 解决冲突
chenzhi f2148320a8 新增公会旧数据归属刷新脚本
chenzhi 61d0418340 推广公司管理 修改内外团影响底下
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化游戏统计弹框时间错误问题
chenzhi 82aa4f762b 优化游戏统计弹框时间错误问题
chenzhi d7737291ed 暂存1
sunke e7397e38b9 ios
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release 
修复检索问题
yulingwei c40f5dda26 upt
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
sunke 49efb2e60f xiufu
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release 
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
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 充值财务管理金额保留小数点
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release 
导出问题修复
yulingwei eca43f471d upt
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源bug修正
zhengyongxing 3b58c877c4 测试资源配置状态添加
廖金灵 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
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
测试资源定时脚本修正
sunke 7194cd49ae 平台币
zhengyongxing 61b5fb48b6 测试资源配置状态添加
廖金灵 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 修改样式问题
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke fd815ef5a6 html平台币
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release 
ip限制白名单提示语修改
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log 
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit 
 Conflicts:
	Data/update.sql
sunke e0d8539ea0 ex
sunke 35f5cc03bb value_detail
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限制白名单提交
zhengyongxing c3adec70ec ip限制白名单提交
sunke 41f6797e97 表格样式
sunke 7da471b6ee 支付时间
yulingwei 8e7dd34b92 upt
yulingwei 4afce87caa upt
yulingwei b56ba0b882 upt
yulingwei 823062c0f6 upt
yulingwei adf11e2b60 upt
yulingwei fc3b7be03e upt
yulingwei 175502e384 fix
zhengyongxing 5d81a253db ip限制控制器提交
yulingwei b10717e8b6 upt
zhengyongxing 80d48600f7 Merge remote-tracking branch 'origin/fix/admin_second_optimization' into fix/admin_second_optimization
zhengyongxing e63c52ba2c 市场结算管理，定时器完成
chenzhi bfee0578d0 玩家列表新增去重数据栏
chenzhi 52c78bb835 优化统计-统计-推广员统计
yulingwei 18b0c3024d upt
yulingwei ead4a8598e upt
yulingwei d9c338acd8 upt
chenzhi c61f750549 优化新增推广员员时手机号错误问题
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改
zhengyongxing f904ecec94 管理后台日志唯一键值bug修改
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度
zhengyongxing d5561209fd 管理后台日志唯一键值bug修改
zhengyongxing 958fb41227 管理后台日志唯一键值修改
廖金灵 e885a75d1d Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化游戏统计及公会统计打开速度
chenzhi 381327ae21 优化游戏统计
chenzhi a33bf22e52 优化弹框
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题
chenzhi 27d4e7835d 优化公会统计索引1
廖金灵 9b6d2a72d9 Merge branch 'fix/member_user_info' of wmtx/platform into release 
优化用户列表统计数据
yulingwei cf0762cb9c upt
yulingwei 315ebb2152 upt
chenzhi 71530c53e3 优化公会统计内充详情不符问题
chenzhi 75c934490e 测试 回退
chenzhi b8d4204ef9 ceshi
chenzhi 02d36af96a Merge branch 'feature/add_opertion_log' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
chenzhi d64895896f 优化公会统计默认值
zhengyongxing e31138b5a5 测试白名单bug修改
chenzhi ccda6e0b39 开启操作日志
chenzhi 45cad05508 优化用户列表统计数据
ELF dae2dd5fd9 优化游戏
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei 4caa02a76b upt
yulingwei b8fda2417a 工单管理
sunke 389ef7e967 bug修复
ELF b81842e6e0 解决冲突
zhengyongxing 48239c0f13 测试订单bug修改
ELF 9e82faf6f3 关闭后台操作日志
sunke 098c63d63d 支付渠道优化
zhengyongxing 141bdf561a 支付渠道添加索引
sunke 2ecb05d924 支付渠道统计
sunke 3edb0640ed 新增管理后台测试订单导出功能
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
zhengyongxing 3302015365 行为日志增加修改绑定推广员操作
zhengyongxing 4ee6146a49 Merge branch 'feature/user_repeat' into release
zhengyongxing c6eef5124d 测试资源修改
zhengyongxing 7f0c883904 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 11f8434215 Merge branch 'feature/user_repeat' into release
zhengyongxing a2312d9eaa 用户去重bug修改
chenzhi 50b21f45ab Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 7fa400a0a5 优化公会统计统计栏样式
zhengyongxing 443abed206 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 19d85f3717 测试资源可用余额接口修改
chenzhi 8fdcf88825 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi 3cbf6c5a39 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi fac54ad10d 优化绑币收回内存
zhengyongxing 15cd1b51da Merge branch 'feature/user_repeat' into release
zhengyongxing 1a6282c52c 测试资源可用余额接口修改
zhengyongxing caddcd1543 日志管理删除url开启
zhengyongxing 14c3d365e3 Merge branch 'feature/user_repeat' into release
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服
zhengyongxing ffd6238bc1 测试订单bug修正
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证
chenzhi fd7dc828bd Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 650d0c8f69 优化公会统计内外团检索
chenzhi 63314e6ccc Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi a340a74864 优化公会统计游戏统计的内外团统计
chenzhi 9208f78293 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
chenzhi cc3552b862 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi d0f07315da 操作日志前端检索名词修改
yulingwei 4b195fa3ba Merge branch 'hotfix/fix_bug' into release
万盟天下 a47d41903a Merge branch 'hotfix/fix_bug' of wmtx/platform into master 
渠道费率问题
yulingwei 68cee2d381 fix
zhengyongxing 8ef0543b56 游戏统计错位bug提交
zhengyongxing f840a59ce2 日志操作bug修复
zhengyongxing a763b96199 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing c1ad1396bc 日志操作bug修复
chenzhi 62c8c1e54d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi a44b8670b0 玩家信息修改操作日志
chenzhi 7d5d6c3b3d 礼包管理-操作日志
zhengyongxing b864934969 行为日志时间筛选修正
chenzhi dd0f930105 游戏预告-操作日志
zhengyongxing 10f2f4b210 行为日志导出错误修改
zhengyongxing 0443871173 用户列表去除重复行
chenzhi c24b5b9e9c 合作方管理-操作日志
chenzhi 79108b7a93 原包管理-操作日志
zhengyongxing 67ab1fa89e Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式
zhengyongxing 25954045e9 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 0b8c42379d 游戏导出设备类型修正
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 44f44d0c4a 操作日志函数修改
chenzhi ae34eecb24 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 77dbc94063 游戏类型-操作日志
zhengyongxing 3b73c1d340 操作日志bug修正
zhengyongxing 7f0cc29c78 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release
liuweiwen 1f9a407794 Merge remote-tracking branch 'origin/release' into release
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release
liuweiwen f35c7bdc77 实时充值查询增加易宝支付
zhengyongxing 19cbae833a 操作日志bug修正
zhengyongxing bfe5aeec0a Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 31948abdf4 操作日志bug修正
chenzhi b7d0012d6e 游戏列表-操作日志
zhengyongxing f9be1c2f48 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 498508b7f1 推广结算管理日志添加
zhengyongxing 665b4c8bfa 推广结算管理日志添加
zhengyongxing 9a2ee9d28f 行为日志行为字段bug修改
chenzhi 61a29307f2 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 8bb790cf4e 优化月结导出错误
zhengyongxing ab6e063c9a 推广员管理管理日志添加
chenzhi a9f984d0aa 充值大块-操作日志ok
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release 
# Conflicts:
#	Application/Admin/Common/extend.php
liuweiwen 5d596094a6 增加易宝支付
liuweiwen f74cfcc756 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
chenzhi 31c7732002 支付渠道统计-操作日志
zhanglingsheng c6e1493035 易宝支付
chenzhi 71f2453bb4 绑币回收-操作日志
liuweiwen aa7e6fa0ec 推广公司新增与编辑减少必填项
chenzhi cb696c923f 后台发放（玩家）-操作日志
chenzhi e6fe04a218 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 60edd1f8ca 后台发放（玩家）1-操作日志
zhengyongxing 9cb8fadf39 测试资源管理日志添加
chenzhi 31a0a174bd 后台发放-操作日志
chenzhi 4cd078450c 平台币充值-操作日志
chenzhi 6617fff329 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi f6d991124b 平台币充值-操作日志
liuweiwen c9d69414ba Merge branch 'hotfix/game_recharge_stat' into release
liuweiwen 22aa120ad6 去掉多余的换行
liuweiwen 1a4bf752c4 Merge remote-tracking branch 'origin/release' into release
liuweiwen 9468366a99 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
liuweiwen b081544805 Merge branch 'hotfix/game_recharge_stat' into release
zhengyongxing 0aa1f53a5f 下游结算单管理日志添加
zhanglingsheng 95f93bdc04 配置添加易宝支付
liuweiwen 4a45103650 平台币充值汇总补一列
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
zhengyongxing 5224eec9f2 上游结算单管理日志添加
liuweiwen 9221b18955 游戏统计汇总权限
chenzhi cbd1625ecb Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 6cb25fe7fe 游戏充值-操作日志
zhengyongxing 6483047fe4 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 5e794bd785 推广员日志记录添加
chenzhi e129a044d4 操作日志-角色权限
zhengyongxing 8aae878cf8 游戏统计修改
zhengyongxing 3c628fa1c6 统计日志添加
chenzhi 81830703f3 角色权限-操作日志1
zhanglingsheng 9c39b731fd Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng dbd1e6f070 易宝支付配置
liuweiwen 94293b4bec Merge branch 'feature/resource_config' into release
liuweiwen b4fafbe0bf 修改配置比例范围
chenzhi 3a9575c602 管理员列表增删改导出-操作日志
liuweiwen fa9746342f Merge remote-tracking branch 'origin/release' into release
liuweiwen cc8e2149e0 最低额度，最高额度，比例数据格式校验
zhengchanglong ba96083bb5 录入测试订单 时间控件修改
zhanglingsheng 0363058592 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng c9eecfa9c5 获取支付配置添加易宝支付
liuweiwen 1e24fadb79 最低申请额度与最高申请额度不能小于0
chenzhi 40d2c2777f 测试白名单增删改操作日志
zhengyongxing a6a29bf63a 统计日志添加
chenzhi dc171af556 分控新增与解除操作日志
liuweiwen 8e3ee63a44 自动审核规则调整
chenzhi 55fd5d94e8 实名认证，防沉迷
liuweiwen 7d879686af 自动审核规则调整，锁定显示红色字体
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核
chenzhi 0e0a7263e3 操作日志-防刷预警
chenzhi 97ff3baaff 优化操作日志下载
chenzhi 7141e3752e 优化操作日志基函数
chenzhi a8c83122db Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
chenzhi 148d445f10 用户新增导出操作日志
zhengyongxing ce59d5dc72 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 3f4f39e238 封装时间函数
chenzhi 580eb9dea3 优化移动公共函数后的变化
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中
chenzhi 2de1d9bccb 优化批量操作
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 02407d1c50 优化操作日志函数
zhengyongxing dd478e264f 行为日志按照原型修改完成
zhengyongxing 1aa12fe2d1 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing d2867b4635 行为日志完成
chenzhi bd53d01a0e 用户编辑优化
chenzhi 80f8eb431c 用户编辑结束
chenzhi 6dfb13e4d9 新增操作权限
chenzhi 0d4ca0840b 优化平台币回收内存
zhengchanglong 7d13703398 角色列表角色ID和角色名改为不受权限控制
liuweiwen ad48df6c91 数据展示权限
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限
zhanglingsheng a1b79b57ae Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengyongxing 009ef6719d 结算单管理审核状态bug修改
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release
zhengyongxing e01bcc236f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
zhengchanglong eecd38e424 Merge branch 'fix/divide_test' into release
liuweiwen 2cf7b7471f Merge remote-tracking branch 'origin/release' into release
liuweiwen 305cbf34cd 导航高亮
liuweiwen 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen c05b10cb87 对账单系统-》未审核不可确认
ELF 5627dd94d2 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 7cd28cc7ce 删除多余代码
yulingwei e2851c13f1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 5dde3ef96e upt
ELF 3411f90430 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF dad83c8d38 押金付款方式添加选项
yulingwei dc96411757 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 0513f0fa5e fix bug
zhengyongxing 4f65efad9b 结算单管理添加审核状态
liuweiwen fbdd7a4339 Merge branch 'feature/admin_optimize' into release
liuweiwen daec62ec95 奖罚记录管理-》编辑，无修改时提示错误
chenzhi da454a9474 Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test
chenxiaojun 29c8470b7f 推广平台>财务管理>结算中心--更新
chenxiaojun 118aae4f83 推广平台>财务管理>结算中心--更新
chenxiaojun f5c1531b71 推广平台>财务管理>结算中心--更新
chenxiaojun 23f38f6a07 推广平台>财务管理>结算中心--更新
chenzhi c2de546abb Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 578948347f 优化公会内外团占比
chenzhi c52ba1cf99 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi fa92868548 优化公会统计团体占比
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release
zhengyongxing 9edc77bead 生成下游个人结算单bug修改
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改
yulingwei 619ea78b18 upt
yulingwei 3f5246f66c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei c59aeaa9d3 upt
chenzhi 1bfcade0a8 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 62a867c592 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 5b45c4273c 优化公会统计选择游戏
yulingwei 5468239cf3 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e8e0af97bf 修复结算时间
chenzhi 43a6a746b0 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
zhengyongxing 061d7373fb 市场结算管理内外团新增内团分发
chenzhi f0d298c042 公会统计新增团体类型
yulingwei 82bc3a8dbd upt
yulingwei b99138fa85 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 14b5ea78cd upt
zhengyongxing ccc1b177a0 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读，新增编辑判读
liuweiwen e8f07f4292 日期格式修改
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release
liuweiwen f9fe74986c Merge branch 'feature/admin_optimize' into release
liuweiwen b2e039b460 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen f6af63ca3e 合同期限为空时间格式，公司信息导航高亮
zhengyongxing 5158b07d85 测试订单管理高亮添加
zhengyongxing 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing be932b1ebd 奖罚管理bug修改
zhanglingsheng a26a02b36f Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动，解决未显示下游公司问题
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi b3560b4345 优化财务汇总统计
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi e4854d4ac7 优化财务汇总名词写错问题
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器
liuweiwen 854ab9f509 合作方导出不打开新窗口
liuweiwen d50627e4fb Merge remote-tracking branch 'origin/release' into release
liuweiwen 70c71abac1 隐藏我方分成比例
chenzhi 07053d822e Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release
chenzhi bb276f2bcc 优化推广公司列表
liuweiwen a114c7e659 Merge branch 'feature/admin_optimize' into release
liuweiwen efe9d25988 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3efe7167f2 公司性质
liuweiwen d333b8d61e Merge branch 'feature/admin_optimize' into release
liuweiwen 8dedae5587 公司性质
chenzhi 43a3beae23 合并财务分类汇总
ELF 0134a158e1 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF 2967d023d7 Merge branch 'hotfix/download_name' into release
ELF ec4bc4d46e 修改极速版下载描述文字
chenzhi cbbbcfd8ff 新增外团分发和其他团统计
liuweiwen 2ac78def85 Merge branch 'feature/admin_optimize' into release
liuweiwen 3bb3a8b45d 显示调整
liuweiwen 5b6477e782 Merge remote-tracking branch 'origin/release' into release
liuweiwen 5f74f692d5 Merge branch 'feature/admin_optimize' into release
liuweiwen 58aefd2997 显示调整
yulingwei 37c4e8ab73 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 762cd1cbb1 Merge branch 'feature/ylw' into release
yulingwei dc2b55456d upt
liuweiwen 6af2277d94 Merge branch 'feature/admin_optimize' into release
liuweiwen b8ec26a3e9 合作方开票税点百分比改为存小数
liuweiwen 70984bea99 Merge remote-tracking branch 'origin/release' into release
liuweiwen 48252d0f3a 合作方列表样式调整
zhengchanglong 1b37ec3d37 Merge branch 'feature/add_promote_company' into release
chenzhi f5529fc2dd 优化推广公司首页样式
liuweiwen 5544bb1797 合作方列表样式调整
sunke 3bc44925cd 推广配置
sunke 072b3e0199 推广配置修改
liuweiwen 4cb88be352 数据权限
zhengchanglong 26038f379e Merge branch 'feature/admin_optimize' into release
zhengchanglong 8bd26b36c0 玩家账号信息权限设置
yulingwei 73706808e3 Merge branch 'feature/ylw' into release
yulingwei 19e7f2af0c upt
yulingwei d349c4223d Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei 0652c31664 upt
yulingwei 25e66d84ff 修改问题
liuweiwen 87de8d2717 Merge branch 'feature/admin_optimize' into release
yulingwei 391d2a4a1f Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e7497048a0 Merge branch 'feature/ylw' into release
yulingwei 8b51a16730 upt
liuweiwen 32f5137ac6 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 04bb4a7bb7 合作方
sunke 790d56c638 Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
zhengyongxing 00a5fed6fd 游戏统计新增设备类型
chenzhi 4eaa92f0fb 优化导出银行卡变科学计数
liuweiwen 52668ace85 合作方导出优化
yulingwei 40ddeae55a upt
yulingwei 47d01e0aff upt
ELF 35b267027c Merge branch 'hotfix/download_name' into release
ELF 129a1103e2 修改beta版下载名称
zhengyongxing 5626dfaf99 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 21cac27332 Merge branch 'feature/admin_optimize' into release
zhengyongxing 70ddcb63e0 生成下游个人结算单bug修改
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release 
# Conflicts:
#	Data/update.sql
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release
zhengyongxing 065cf7d566 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 938a82e993 生成下游个人结算单bug修改
liuweiwen e15460b08f 合作方
chenzhi 6bb3387b0e 新增推广公司分成比例百分号
chenzhi f507dde70b 新增推广公司导出功能
yulingwei dfe52865bd upt
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 2589a76603 生成下游个人结算单bug修改
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 71dabfae53 生成下游个人结算单bug修改
chenzhi 31deafcb3c 优化合作公司列表页面
ELF 055e246f70 修改bug
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 7da5e25e16 合作方
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release
chenzhi a26a1191cc 优化上游结算提示
yulingwei 469a037b0f merge
yulingwei 3c44d5d200 upt
chenzhi 5cea54585f 优化上游结算单选择后初始值变动
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
chenzhi 44a34bc89f 新增推广公司删除
chenzhi 4e28b39999 新增推广公司编辑功能
chenzhi 6ea7a581f5 推广公司查看
chenzhi f218544e7f 优化推广公司添加
chenzhi da2e3a769c 推广列表查看
liuweiwen a1c3ad8fb3 数据展示权限
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 8462f80777 合作方
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release
zhengyongxing a9924e67c1 测试订单列表与录入bug修改
zhengyongxing 2d0d59c0a5 Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order 
 Conflicts:
	Application/Admin/Controller/TestOrderController.class.php
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改
chenzhi 38fc3c3054 推广公司列表2
zhengyongxing c461623b5e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加
chenzhi a3aa3700a7 修正company_belong模糊问题
chenzhi 542c76f266 推广公司列表1
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 8dd5f7bf5c 结算单管理添加
chenzhi 92929b1db7 优化推广公司添加
chenzhi 84f5ff2e95 优化添加推广公司结构
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索
chenzhi 1f1e75e736 新增推广公司添加
chenzhi 6a612565c6 扩展推广公司添加
chenxiaojun 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新
sunke 3dbacf225b 指标下载处理
sunke ffd29e2662 指标导出处理
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release 
 Conflicts:
	Data/update.sql
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板
zhengyongxing 955a1917b3 生成个人结算单的功能完成
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release 
# Conflicts:
#	Data/update.sql
zhengchanglong 282033afe7 测试订单录入添加分页
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e35f20ee70 游戏预警
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release
zhengchanglong d0de91e89d 测试订单查询修改
sunke 8298ef3e3d 删除打印
sunke 739eff3d00 删除打印
zhengchanglong 42a0876ab2 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order 
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
zhengyongxing 2aa68e4412 测试订单录入功能提交
zhengchanglong 53b9573d71 测试订单查询修改
zhengyongxing 8aba8728f0 测试订单录入功能提交
zhengyongxing 56ecea6998 下游个人结算单生成代码上传
zhengchanglong 284f42b315 测试订单录入
zhengchanglong fc0bb831a7 测试订单录入
zhengchanglong 254d29f3f2 测试订单录入
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新
sunke f92533e6a5 渠道计算修复
sunke 8db53afc8b 电子文档及公司录入信息
sunke 5fe238ccbd 渠道流水计算
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF bbb31890f6 未收押金会长禁用落地页/下载页
sunke 7f169dc211 渠道流水计算
ELF ed25d54dc8 解决冲突
ELF 501b8099d4 解决冲突
chenzhi 2fe965749e 财务汇总ok
chenxiaojun b7d2931106 管理后台--更新
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新
sunke 56981a0acc 渠道计算
yulingwei 0983ea1027 Merge branch 'feature/admin_optimize' into feature/ylw
yulingwei 2cd5574de7 新增审核时间
yulingwei 6b6baa4f92 合并
ELF 69185016a0 修改
liuweiwen dfd198e9b7 对账系统增加奖罚数据
zhengyongxing 5ab9f2cc1c 下游个人结算单生成代码上传
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen ce960beb6d 合作方手机格式验证修改
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
liuweiwen e6cbcd86d3 Merge branch 'release' into feature/admin_optimize
liuweiwen 2af2505819 合并热修复
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
liaojinling e596d11cee 会长押金
zyx 079027a778 Merge branch 'hotfix/dopositCpModify' into release
zyx a9cae8424b 游戏充值bug修改
zyx c2b54611b7 Merge branch 'hotfix/dopositCpModify' into release
zyx 1cfc48ded2 游戏充值cp订单号修改
liuweiwen 2bffe498bf 奖罚记录管理优化
zyx 0aad9c4735 下游结算单生成功能上传
chenzhi aaf67b85cc 新增旧月份统计方法
jbRotk a6b1194be0 解决冲突
jbRotk 5d315d4182 添加工会类型
chenzhi 57e979408e 优化奖罚规则
chenzhi 3703d7040b 财务分类统计脚本1.0
chenzhi 1f5944c0a4 优化奖罚符号问题
zhengchanglong 24d1366d0a Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b94bf93823 0点游戏统计
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 9e9a925429 奖罚记录管理
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化
jbRotk 72cfd9ec64 新增渠道费率
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release