448 Commits (c42a123ad7f01c92f550ed37884ddd48646b4edf)

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