412 Commits (4460f8e7cf8c5ddcd20570c7fd5906873a4a141a)

Author SHA1 Message Date
chenzhi 4460f8e7cf 新增结算包名 4 years ago
chenzhi 2619e598e8 合并marster 4 years ago
chenzhi d662c89b7e zancun 4 years ago
chenzhi d9d55a3bcb 优化新增下游公司 4 years ago
chenzhi 69adcbabf8 优化推广公司 4 years ago
chenzhi 5aa7427504 新增公司信息编辑 4 years ago
chenzhi f7d90780aa 新增CP公司审核 4 years ago
chenzhi 33cf2cf8a6 新增审核列表 4 years ago
chenzhi 0c2e2db65d 新增税费费率 4 years ago
chenzhi 913793ac2c 优化打款 4 years ago
chenzhi 52b1168930 优化打款记录 4 years ago
chenzhi e9c3355c90 优化打款名称 4 years ago
chenzhi df878183ee 新增打款表 4 years ago
chenzhi 0c91774854 解决冲突 4 years ago
chenzhi 24f2b76bd6 新增导入 4 years ago
chenzhi 8d32b5104e 新增excel打款 4 years ago
chenzhi c9d6b9859d 合并热更 4 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
4 years ago
chenzhi 5fc03a14a4 优化cp添加 4 years ago
chenzhi 03f4130e9e 新增上游合作 4 years ago
chenzhi d52ab03714 新增推广公司游戏选择 4 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 4 years ago
chenzhi c76cf038cd 己方公司 4 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
4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 4 years ago
zhengyongxing 379716298a 市场专员结算代码上传 4 years ago
ELF 11caa30cfa 修改 4 years ago
yulingwei 8c18f2aa1d 1 4 years ago
ELF 2d872ed710 解决冲突 4 years ago
yulingwei 0decb03cb1 merge 4 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 4 years ago
zhengyongxing b664ba46ad 汇总单代码提交 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
chenzhi af1829c124 新增打款详情 4 years ago
chenzhi f20e4659a0 优化表格 4 years ago
chenzhi 3611e4855d 合并冲突 4 years ago
chenzhi a2fdc7c467 新增打款确认 4 years ago
chenzhi 1f155020d4 新增是否允许打款 4 years ago
ELF 4419030b1a 添加推广限制sql 4 years ago
chenzhi 79a9a8c68c 新增重算 4 years ago
chenzhi 3b8d6eb128 新增导出 4 years ago
yulingwei af5b215f8b upt 4 years ago
chenzhi 0f632f386b 下游个人聚合 4 years ago
yulingwei f969802c26 upt 4 years ago
chenzhi f2ce52ada5 暂存 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi 427d6457fc 上游查看及导出 5 years ago