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

2432 Commits (367345ea8db179c408747ec9c83dec6e9a7becff)

Author SHA1 Message Date
chenzhi c6f4149d6a 修改下游个人聚合
chenzhi a3633ea52e 新增下游查看导出
廖金灵 b62eb3be7c Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release 
隐藏市场总监电话
chenzhi 7ac118c024 下游公司查看
chenzhi 7a5c42eb5e 上游导出优化
chenzhi 427d6457fc 上游查看及导出
chenzhi eeec8b13f2 cp查看
chenzhi 4e4da92420 优化比例
chenzhi 2cf0fdf905 新增公会归属编辑规则修改
chenzhi 22aa5d3dd4 暂存
zhengyongxing f08c0cec9b 苹果beta包添加测试ip白名单
chenzhi 02e7d85e44 优化生成结算单
chenzhi bf24f9bc9d 开户网点该帐户名
chenzhi f7d67ff4c4 新增合作方阿里账号及用户
chenzhi cd0ff2ef8a 暂存
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单
chenzhi 466f1f4680 汇总提交ok
chenzhi c39da62037 新增是否打款
chenzhi e1d624fe8b 优化导出并聚合数据
chenzhi 903fc71255 新增补链账号错误
chenzhi 8bfe249251 新增备注
chenzhi c5e3d78835 新增导出
chenzhi 1d92fdb1db 新增重算接口
chenzhi e80d4eb539 新增确认
chenzhi 93a8bb70e1 新增编辑
chenzhi 669bfa8f25 暂存
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance 
# Conflicts:
#	Data/update.sql
chenzhi 6162f9f8a1 生成上下游结算单
chenzhi 380243dbb8 优化结算的补点
chenzhi 4c0c51e0ae 上游结算ok
chenzhi fe7d21943b 暂存2
chenzhi c71c142227 暂存
chenzhi b4c93cc433 接口还原分离
chenzhi c59a314afe 优化聚合cp获取接口
sunke 51551e91df Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/paytime_summary
zhengyongxing 394ce7a544 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit
zhengyongxing 9aae41fd20 ip封禁隐藏区域
chenzhi 5c1a8d69a0 新增生效列表页面
chenzhi 8a508c050d 新增编辑
chenzhi 4b8538a3bb 新增审核操作
chenzhi f20cfde7c7 新增审核列表导出
chenzhi e684191b45 优化审核列表
chenzhi b5a604d385 优化添加
chenzhi e5dc86118e 新增优化
chenzhi 1139b37a50 新增公司关系绑定
chenzhi 3b8e7eb2b0 推广游戏分成管理ok
chenzhi a8fddb8f2f 优化游戏分成
chenzhi 0d8ec00225 优化排序
chenzhi 8a83e17485 新增导出
chenzhi 4533b84d2c 权限
zhengyongxing 0953eb4dd4 Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms
chenzhi 6a3b9b6da3 新增游戏分成比例
chenzhi 1c8ef3493d 优化比例模板
chenzhi c1283ebfeb 游戏比例模板导出删除
chenzhi adbc76c3ae 游戏模板修改
chenzhi 3a8273283e 游戏比例模板新增
万盟天下 04178efac9 Merge branch 'hotfix/admin_three_optimization' of wmtx/platform into release 
优化合作公司列表显示
chenzhi 9c1a12296d 优化合作公司列表显示
chenzhi 6c6dddf6ac Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
chenzhi 982a7f4c1b 更新合作公司列表显示
chenzhi fd4e0baffd 新增游戏比例模板
zhengyongxing fba271cd64 Merge branches 'fix/admin_second_optimization' and 'master' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
chenzhi 8b9a4e73fe 接口数据1
zhengyongxing 1c5a02594a 身份认证后台添加
chenzhi e84d545a2d Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
zhengyongxing e949f92434 ip限制操作日志添加
廖金灵 2d7189a224 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master 
优化空值修改
chenzhi 42a9b318fb 优化空值修改5
chenzhi 4ebe2780cc 优化空值修改4
chenzhi 3b6f8c70cc 优化可以为空填写
chenzhi ba9468fedc 新增打款配置
廖金灵 d99db944c5 Merge branch 'fix/admin_second_optimization' of wmtx/platform into master 
bug修复及cp下游接口添加
chenzhi 748ec401f3 新增打款配置1
chenzhi 6c4319cfe2 Revert "暂存" 
This reverts commit a685c14e23.
chenzhi a685c14e23 暂存
chenzhi ec4d180287 优化公会更改
chenzhi 09e71420e0 优化推广员归属审核
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
chenzhi 5ebdda1c85 修改合作方可为空
sunke a4377c017e 支付设置
chenzhi 50462e3470 优化合作方必填项
chenzhi 35d8e379d8 优化操作行为日志隐藏玩家
chenzhi 673e3fb5cd 角色权限修改状态提醒优化
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 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
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
zhengyongxing c58cdd31af 用户行为日志导出修正
zhengyongxing 613d60e4a7 数据权限配置修改
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
新增权限不验证
chenzhi 973f7ca394 现在权限不验证
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release 
聚合财务结算单
chenzhi 21a985ae82 聚合财务结算单ok
zhengyongxing 4f88cd025e 绑币导出修正
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 38f478d63d 数据调整修改
zhengyongxing 8d7dbe5469 测试资源修改
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
zhengyongxing 5dbd0eb8fa 业绩配置修改
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 a9e6dafad3 行为日志修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi afd362d847 聚合结算单导出优化3
chenzhi 2fc38b25b6 聚合结算单导出优化2
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
chenzhi 73ac725950 聚合脚本ok
ELF 0af6a53ba7 后台arpu功能优化
chenzhi 95cd9993e2 聚合财务1
zhengyongxing 941f27e2e3 获取用户账号的方法添加
zhengyongxing 4d938b85f4 导出账号权限修改配置
zhengyongxing 0482836a8e 导出账号权限添加
zhengyongxing a5554f7fa3 推广员业务配置功能添加
zhengyongxing 295ca2d803 推广员业务配置功能添加
万盟天下 aa663b3c02 Merge branch 'release' of wmtx/platform into master 
优化游戏管理
ELF 144e4e4ea7 计算ARPU
ELF 908722c5be 修改
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
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 c3cb357e1c upt
廖金灵 b09ccfc42d Merge branch 'feature/fix_work_order' of wmtx/platform into release 
修复问题
yulingwei 872a76356d 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 163388e75c 平台币
sunke ae0e10166a pt
sunke 07c385e561 平台
sunke aa14aa95a6 平台
sunke b6649a7b9d 平台币
yulingwei ccc159d3b2 upt
yulingwei 42026e753a upt
yulingwei 7b3006f871 upt
yulingwei 5009a327db upt
yulingwei f1428a8fe7 upt
sunke 5fa22cfa40 弹窗
sunke fee97bb00a Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
yulingwei dec978da7a upt
yulingwei e462305587 upt
yulingwei 312448c724 upt
sunke 253c956794 平台币
sunke 2adcb68c06 平台币新增需求
sunke 97e8397d76 文件夹优化
sunke 1fe794b597 平台规则样式优化
sunke ec309c2b6a 规则
sunke bdb688c985 编辑规则
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信
ELF 94575cae29 修改会长押金编辑付款人付款账号非必填
yulingwei c1d03cc526 upt
yulingwei 9d6bf8225a upt
yulingwei 007374e121 upt
廖金灵 8dc7adb539 Merge branch 'feature/giftbag_tf' of wmtx/platform into release 
添加tf礼包
sunke ce2408576c 充值方式统计匹配支付渠道
sunke 6cc33a7fe8 导出顺序
sunke 15f6cb19a3 渠道支付顺序
ELF 2a2e5f0d31 添加tf礼包问题
张谷诚 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 优化选择
chenzhi abf43566e4 调整参数
廖金灵 86a90467ff Merge branch 'feature/president_apply' of wmtx/platform into release 
修改会长押金需求
zhengyongxing d4aafd2983 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi 14ffc00f86 优化权限处理
chenzhi d4a498baba 优化用户登录时间为0时为暂无登录
chenzhi b1701889c4 优化财务比较金额不符规则
chenzhi 5ddf75a600 财务对比ok
chenzhi b2ad4e8b6e 财务对比 v1
chenzhi a2db46d1c0 财务对比首页
zhengyongxing f37cdc596d 支付渠道测试订单录入bug修正，支付意愿统计功能优化
chenzhi 79f4719dec 财务对比7
chenzhi c4eb963cfe 财务比对5
zhengyongxing 573e580778 支付渠道详情检索修正
zhengyongxing bba97196ec 支付渠道详情检索修正
zhengyongxing 2fab9d3ef9 支付渠道详情统计bug修改
zhengyongxing 45847a8194 支付渠道详情统计bug修改
chenzhi 6abef9385e 优化测试服订单导出
chenzhi 202f9a45d1 财务对比4
zhengyongxing e34c553358 支付渠道统计bug修改
zhengyongxing 8d742886a7 支付渠道统计bug修改
chenzhi effe6c572e 财务比较3
zhengyongxing 96eee4f9f5 支付渠道统计bug修改
zhengyongxing ab01c02606 支付渠道意愿统计修改
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi def286ec80 财务比较2
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release 
游戏名称不含设备类型优化
chenzhi ea69ecb086 财务比较2
zhengyongxing a7838bb552 Merge remote-tracking branch 'origin/fix/fiancecount_gamename_change' into fix/fiancecount_gamename_change
zhengyongxing e445108eb6 支付渠道统计修改
chenzhi 6f7e0de83d 优化平台币设备，名称
chenzhi 6c8f935170 支付渠道
chenzhi 751357feef 优化导出
chenzhi 48e5e4d824 财务对比1
chenzhi ce1d15c602 优化游戏订单导出
廖金灵 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 支付限额
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
chenzhi 6d3f1b67e2 支付渠道统计-首页 名称优化
sunke dfb83d35d0 时间样式
ELF ef56ea2180 修改
ELF fb6a00859e 修改会长押金需求
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修改
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 测试资源配置状态添加
廖金灵 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限制白名单页面去除内购总开关
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release 
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
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 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