Commit Graph

2076 Commits (d9d55a3bcb9884b3a371f77ece304b9cd1263852)

Author SHA1 Message Date
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 c3adec70ec ip限制白名单提交
sunke 7da471b6ee 支付时间
yulingwei 8e7dd34b92 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 ead4a8598e upt
chenzhi c61f750549 优化新增推广员员时手机号错误问题
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 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 45cad05508 优化用户列表统计数据
ELF dae2dd5fd9 优化游戏
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei 4caa02a76b upt
yulingwei b8fda2417a 工单管理
sunke 389ef7e967 bug修复
ELF b81842e6e0 解决冲突
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修改
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
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 25954045e9 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 0b8c42379d 游戏导出设备类型修正
chenzhi ae34eecb24 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 77dbc94063 游戏类型-操作日志
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release
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 f74cfcc756 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
chenzhi 31c7732002 支付渠道统计-操作日志
chenzhi 71f2453bb4 绑币回收-操作日志
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 平台币充值-操作日志
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
zhengyongxing 0aa1f53a5f 下游结算单管理日志添加
chenzhi 037675ce1d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into feature/operation_log
zhengyongxing 5224eec9f2 上游结算单管理日志添加
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 3c628fa1c6 统计日志添加
chenzhi 81830703f3 角色权限-操作日志1
chenzhi 3a9575c602 管理员列表增删改导出-操作日志
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 148d445f10 用户新增导出操作日志
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 优化平台币回收内存
liuweiwen ad48df6c91 数据展示权限
liuweiwen 446e6f8176 Merge remote-tracking branch 'origin/release' into release
liuweiwen 3f5739c1d7 游戏充值和平台币充值数据展示权限
zhanglingsheng 31466db00d 支付类型添加易宝支付
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 941ba5628d Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen c05b10cb87 对账单系统-》未审核不可确认
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
chenzhi c2de546abb Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
chenzhi 578948347f 优化公会内外团占比
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release
zhengyongxing 9edc77bead 生成下游个人结算单bug修改
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改
yulingwei 619ea78b18 upt
yulingwei c59aeaa9d3 upt
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 932958a071 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing be932b1ebd 奖罚管理bug修改
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动,解决未显示下游公司问题
chenzhi 2361c6502a Merge branches 'release' and 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi b3560b4345 优化财务汇总统计
chenzhi 3ddef5d790 Merge branch 'feature/finance_cwflhz' of 47.111.118.107:wmtx/platform into release
chenzhi e4854d4ac7 优化财务汇总名词写错问题
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器
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 5b6477e782 Merge remote-tracking branch 'origin/release' 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 b8ec26a3e9 合作方开票税点百分比改为存小数
sunke 3bc44925cd 推广配置
sunke 072b3e0199 推广配置修改
liuweiwen 4cb88be352 数据权限
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 e7497048a0 Merge branch 'feature/ylw' into release
yulingwei 8b51a16730 upt
liuweiwen 04bb4a7bb7 合作方
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
yulingwei 40ddeae55a upt
yulingwei 47d01e0aff upt
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
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
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
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
chenzhi a3aa3700a7 修正company_belong模糊问题
chenzhi 542c76f266 推广公司列表1
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 8dd5f7bf5c 结算单管理添加
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 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 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 下游个人结算单生成代码上传
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
liuweiwen 51d2d91671 验证手机号码格式修改
chenzhi 7657db3b18 财务分类-支付渠道/支付类型
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize
jbRotk 5f510cd4d9 新增奖惩时间
liuweiwen 289fd24ab6 内部公司信息管理
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
liuweiwen c92fa425d2 内部公司信息管理
chenzhi cb4e457ace 财务汇总-按合作方类型
jbRotk c968e54cf8 解决冲突
jbRotk 94afe49b0c upt
chenzhi 993bedc98f 收入类型-测试收入
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正
jbRotk 35b6d25ebc upt
chenzhi 5eaadd974a 财务分类汇总-按收入类型1
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型
chenxiaojun cbe40d4b0f 管理后台更新
chenxiaojun f1b454627e 管理后台更新
sk c612fbc5fd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
chenxiaojun 37ab08b9be 管理后台>推广员>结算管理>公会分成管理--规则修改
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改
zhengchanglong 58bd9414d6 Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b5a2ddba3c 游戏订单查看,查询时0点属于当天
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能
zhengchanglong 72d222a64a CP分成比例修改
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后,无法检索出万盟天下
zyx fea720339b 结算单功能优化 / 下游结算单:列表展示游戏不区分安卓IOS,直接展示汇总信息
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新
廖金灵 f66c6505d1 Merge branch 'hotfix/testWhileList' of wmtx/platform into master
测试外网充值白名单设置BUG修复
sk 636aabb5a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
zyx d4850b60be Merge branch 'hotfix/testWhiteList' into release
zyx 2ad5017fae 测试白名单编辑修改成删除
sk f93c9c569d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
xxxx a85c217c6b OA管理员绑定
zyx aac1d6f7b5 Merge branch 'hotfix/testWhiteList' into release
zyx 7beb0938e3 测试白名单修改
sk ce9faf7271 公司录入
jbRotk 65461ff200 c
liuweiwen 0fba64c6f1 数据展示权限:勾选权限时,*号屏蔽的地方要开放,另没数据权限的地方补上
ELF 56a97f7eef 修改bug
ELF e8a0975981 解决冲突
ELF 6993d164a3 解决冲突
ELF d3a3b8cdb7 修改
yulingwei 22addc182c 修改检索问题
sunke 0e0c1798f4 推广导入空数据初始化
yulingwei f0109e9554 合并请求
yulingwei 45b3c27292 upt
sunke b9ddc1aafb 推广配置
yulingwei eef229d22d Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up
ELF 2195bb4c55 修改短信发送
yulingwei 55ef999729 upt
yulingwei 6daf38aa43 upt
yulingwei dfd274a667 Merge branch 'release' into feature/game_divide_warn
yulingwei 0ebe11027e upt
chenzhi 56617b1e25 Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
chenzhi fa784fac8a 优化游戏订单导出
chenzhi 54f2e0abcd 游戏统计新增会长和公司
sunke d2b7e91a64 推广配置
ELF 9c493dd8ef Merge branch 'release' into dev
ELF 0d45be780f 解决冲突
ELF c01b0f1083 发送短信添加ip地址
chenxiaojun 5a75ea406a 更新
liuweiwen 38c64f5430 管理后台-》推广员列表可关键内外团搜索
yulingwei 076b4393eb upt
yulingwei aafc877e71 merghe
yulingwei d33d0c3f46 upt
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复
zhengyongxing 46a3028fc9 输出删除
chenxiaojun 29789f5ef6 公会分成管理--更新
zhengyongxing 3fca3c89ad 短信验证码提交
chenxiaojun b367b4a8d3 公会分成管理--更新
zhengyongxing 3741b0d27f 市场结算修正
chenxiaojun 42e07d0f2f 结算管理--更新
chenxiaojun 66a238dfd4 结算管理--更新
zhengyongxing 1ba566a02c 市场结算修正
zhengyongxing a68858d4ed Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 9d5b877220 市场结算生成下游代码修改
chenxiaojun 6e05546db6 公会分成管理--更新
chenxiaojun 28897755c9 结算管理--更新
chenxiaojun 258e10c9d1 结算管理--更新
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化
liuweiwen ef975943bb 针对admin的后台账号对游戏充值和角色查询做完全访问权限,没完全访问权限时必须通过搜索才显示结果
yulingwei 23f2334e45 新增充值权限查看
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
sunke 9152a3ef59 推广配置导入功能
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
liuweiwen cdfa8e4eee admin权限
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 21806993d4 admin权限
chenzhi 5fdb7946cc 新增登陆记录列表统计权限
chenzhi 07e4fb2e56 优化列表和统计权限函数
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
chenzhi 4e1567f013 新增玩家列表列表及统计权限
zhengyongxing f4b6fa4738 用户信息小号隐藏
zhengyongxing 076daf0d4e query冲突解决
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF f7a53c7562 Merge branch 'feature/account_safe' into release
ELF c4934613ae 解决冲突
ELF b0bc4c0496 解决冲突
ELF 0f44d9e95c 解决冲突
liuweiwen 08f8c518a6 从dev复制代码
liuweiwen 7431072bbf 从dev复制代码
chenxiaojun 6d215bda63 公会分成管理--更新
chenxiaojun 6012fdbdf1 公会分成管理--更新
chenxiaojun 02ccf125dc 公会分成管理--更新
chenxiaojun 365a276b95 公会分成管理--更新
zhengyongxing 1a52a129f2 Merge branch 'feature/group_type' into dev
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化
chenzhi 7ff7758df2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ef0b3c86f0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi ce92602ca0 优化生成上游订单重复提醒
zhengyongxing c07167e784 结算单bug修正
zhengyongxing 943969bddd Merge branch 'feature/group_type' into dev
zhengyongxing c09c3a591e 结算单bug修正
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水
chenxiaojun ba9b5e33d1 更新
chenxiaojun d615a1402f 公会分成管理--更新
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev
liuweiwen 57a1d8ed8c 对账系统
zhengyongxing b735706006 Merge branch 'feature/group_type' into dev
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正
liuweiwen af28ff9155 工会归属查询
liuweiwen c7b9e2a7d6 Merge branch 'feature/group_type' into dev
liuweiwen a7e9f62367 对账系统自动登录
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev
liuweiwen 51844a824e 工会归属会长必填
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type