4748 Commits (5f0ebf39582f20c258886d16fbf8bd298a5ea5b9)

Author SHA1 Message Date
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 4 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 4 years ago
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定 4 years ago
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断 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
zhengyongxing 83717b64ae 市场专员业绩管理优化 4 years ago
廖金灵 56619e58b7 Merge branch 'hotfix/market_name' of wmtx/platform into release
市场专员识别
4 years ago
ELF 3f42d2967c 修改 4 years ago
ELF 70c9e26ce4 修改bug 4 years ago
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 4 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
4 years ago
ELF ecc228409d 修改 4 years ago
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
4 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 4 years ago
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化 4 years ago
zhengyongxing acc45f5911 江息网络漏掉的修改 4 years ago
chenzhi bc75da8c14 解决冲突 4 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 4 years ago
zhengyongxing 1234349844 市场专员业绩计算修改 4 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 4 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
4 years ago
chenzhi 21a738054a 隐藏推广公司比例 4 years ago
zhengyongxing 39e2bce6dd 推广员充值统计提交 4 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 4 years ago
ELF 990a2bd206 解决冲突 4 years ago
chenzhi a020cb26df 新增不验证手机 己方 4 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 4 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 4 years ago
chenzhi f1824fd7b3 优化新增名称 4 years ago
ELF 7c3a001e25 修改 4 years ago
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制 4 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 4 years ago
ELF 102e77267d 修改bug 4 years ago
chenzhi c76cf038cd 己方公司 4 years ago
ELF e94b6418f1 修改 4 years ago
ELF 8224cfb362 修改 4 years ago
ELF 77c692c44d 修改 4 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 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 2fae4219df 公会统计去除 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 e3b53e7df1 修改 4 years ago
ELF 73f5f4f5ea 修改 4 years ago
ELF 38c10a0f7a 修改 4 years ago
ELF 10aed50db7 修改 4 years ago
ELF f9b054e1cb 修改 4 years ago