137 Commits (0a136fbbde4df72574945b5ffe306b103ac4db91)

Author SHA1 Message Date
chenzhi 5db1f7ce24 优化比例显示 4 years ago
chenzhi 4143a67238 优化下游个人导出 4 years ago
chenzhi 9ee69f9bd4 优化下游结算单导出 4 years ago
chenzhi 82787ca561 优化上游结算单导出模板样式 4 years ago
chenzhi 07fd53a6aa 优化上游导出文件格式及时间问题 4 years ago
chenzhi 7ba9c25610 优化上游导出% 4 years ago
廖金灵 6c8699dc1e Merge branch 'hotfix/market_percentage' of wmtx/platform into master
平台币导出bug修正
4 years ago
zyx 8c0646d2a0 平台币导出bug修正 4 years ago
廖金灵 0665e8265a Merge branch 'hotfix/market_percentage' of wmtx/platform into master
市场结算管理bug修正
4 years ago
zyx 5dcc25f97e 市场结算管理bug修正 4 years ago
chenzhi 1ac4c280ad 优化其他导出 4 years ago
chenzhi 54239b1f54 优化导出 4 years ago
chenzhi 9d9eae85ec 优化上游比例获取 4 years ago
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
4 years ago
ELF a4d4a51a2c 完善支付商户操作日志 4 years ago
chenzhi 205c6a83f8 优化上游结算 4 years ago
zhengyongxing a960e0a7e4 商户bug修改 4 years ago
zhengyongxing 9670bf86b6 商户bug修改 4 years ago
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
ELF 557f0203ac 解决冲突 5 years ago
chenzhi a3f28b67a5 新增游戏搜索 5 years ago
zhengyongxing 341fa19b6f 聚合公司功能提交 5 years ago
zhengyongxing 1ff82cce20 聚合下游公司列表添加 5 years ago
chenzhi 2619e598e8 合并marster 5 years ago
zhengyongxing cacb1e4cf4 商户统计结算功能添加 5 years ago
chenzhi f731a417bd 优化工会关系 5 years ago
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 5 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 5 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 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
zhengyongxing 83717b64ae 市场专员业绩管理优化 5 years ago
ELF 3f42d2967c 修改 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
ELF 8224cfb362 修改 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 f0a8b6bc3b 修改 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
5 years ago
chenzhi 0ba02069a0 优化补点计算方式 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago