Commit Graph

440 Commits (02150820185fabd61b744c135d81fda0cad2247f)

Author SHA1 Message Date
ELF 990a2bd206 解决冲突
zhengyongxing 682ce333b1 市场结算管理公司税率提交
chenzhi c76cf038cd 己方公司
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
zhengyongxing cd0d9e295f 市场专员结算代码上传
zhengyongxing 379716298a 市场专员结算代码上传
ELF 11caa30cfa 修改
yulingwei 8c18f2aa1d 1
ELF 2d872ed710 解决冲突
yulingwei 0decb03cb1 merge
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
zhengyongxing b664ba46ad 汇总单代码提交
zhengyongxing 9d43914b17 汇总单结算代码上传
chenzhi af1829c124 新增打款详情
chenzhi f20e4659a0 优化表格
chenzhi 3611e4855d 合并冲突
chenzhi a2fdc7c467 新增打款确认
chenzhi 1f155020d4 新增是否允许打款
ELF 4419030b1a 添加推广限制sql
chenzhi 79a9a8c68c 新增重算
chenzhi 3b8d6eb128 新增导出
yulingwei af5b215f8b upt
chenzhi 0f632f386b 下游个人聚合
yulingwei f969802c26 upt
chenzhi f2ce52ada5 暂存
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi 427d6457fc 上游查看及导出
chenzhi 22aa5d3dd4 暂存
chenzhi 02e7d85e44 优化生成结算单
chenzhi a9e0b303dd 推广公司新增支付宝账号
chenzhi f7d67ff4c4 新增合作方阿里账号及用户
chenzhi cd0ff2ef8a 暂存
zhengyongxing 1e4a1aef4e 苹果beta包添加第三方支付名单
chenzhi 466f1f4680 汇总提交ok
chenzhi caf432f5d4 新增高亮
chenzhi 8bfe249251 新增备注
chenzhi 93a8bb70e1 新增编辑
chenzhi 669bfa8f25 暂存
chenzhi 9c8e070ba8 暂存3
chenzhi c71c142227 暂存
chenzhi c59a314afe 优化聚合cp获取接口
chenzhi 044f81792f 公司关系绑定申请记录表格
chenzhi 7fb7d657e2 新增公司关系表
chenzhi 6a3b9b6da3 新增游戏分成比例
chenzhi fd4e0baffd 新增游戏比例模板
chenzhi 6db149202d 暂存
zhengyongxing 192974e52d 身份认证后台添加sql添加
chenzhi 8b9a4e73fe 接口数据1
chenzhi 748ec401f3 新增打款配置1
chenzhi 450ef803d6 合并
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 501574fc7e up更新
zhengyongxing b6b97c130d 测试资源代码修正
chenzhi 990c62b06a 批注增删改查
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
chenzhi 73ac725950 聚合脚本ok
chenzhi 95cd9993e2 聚合财务1
zhengyongxing 4d938b85f4 导出账号权限修改配置
zhengyongxing 295ca2d803 推广员业务配置功能添加
ELF 908722c5be 修改
chenzhi c4eb963cfe 财务比对5
chenzhi def286ec80 财务比较2
zhengyongxing f40bd57698 支付渠道意愿统计bug上传
zhengyongxing f7c9730153 市场结算管理优化
zhengyongxing 4ce89ee670 支付白名单列表功能完善
ELF 4a1ffd2955 解决冲突
廖金灵 a6f82e5820 Merge branch 'feature/work_order' of wmtx/platform into release
修改默认评价分数为5分
yulingwei 9eac722222 修改评分默认5分
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
yulingwei 26f89f3c64 merge
zhengyongxing c3adec70ec ip限制白名单提交
ELF bda92e4e1a 用户重复标识-注册事件通知
ELF b434d2eacc 优化游戏管理
chenzhi ccaa9d3a78 优化公会游戏统计sql
ELF dae2dd5fd9 优化游戏
yulingwei b8fda2417a 工单管理
zhengyongxing 55ad393efb 支付渠道添加索引
zhengyongxing 141bdf561a 支付渠道添加索引
zhengyongxing 84d061c887 sql更新
chenzhi f40072e7d7 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 518d2aa3f6 优化操作日志表结构
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
sunke 1f6de9be57 操作日志
zhanglingsheng d8cd3ae79f 身份证数据添加info字段
liuweiwen 5d05edbca6 资源自动审核扣除已审核额度,申请后续增加自动审核功能
zhengyongxing 3c628fa1c6 统计日志添加
liuweiwen 9d7cfd768e 修改sql
liuweiwen cc8e2149e0 最低额度,最高额度,比例数据格式校验
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi 6dfb13e4d9 新增操作权限
zhanglingsheng 2c7eb8f191 支付类型添加易宝支付
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql