2818 Commits (da4b2ea60bb67b15555223e40c6d1736b322fdb1)

Author SHA1 Message Date
zhengyongxing bded27756e 市场业绩提成bug修改 4 years ago
廖金灵 c008157b0a Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
4 years ago
zhengyongxing 0c5e857ca2 市场业绩提成bug修改 4 years ago
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
4 years ago
zhengyongxing 5ab96edd8f 市场业绩提成bug修改 4 years ago
zhengyongxing 8f4505205b 市场业绩提成优时间大小判断 4 years ago
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
4 years ago
zhengyongxing b64e5858ea 市场业绩提成优化 4 years ago
zhengyongxing 5f113b8bfc 市场业绩提成优化 4 years ago
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
4 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 4 years ago
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
4 years ago
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正 4 years ago
郑永星 a9e8905e27 Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
4 years ago
zhengyongxing 3eeeb449de 提现汇总表时间检索bug修正 4 years ago
zhengyongxing 4e562ffcc4 提现汇总表时间检索bug修正 4 years ago
廖金灵 8ad5533c53 Merge branch 'feature/market_percentage' of wmtx/platform into release
汇率逻辑修改
4 years ago
zhengyongxing 0ac831dece 汇率逻辑修改 4 years ago
廖金灵 aebc8b9f70 Merge branch 'feature/market_percentage' of wmtx/platform into release
编辑汇率时间控件修改
4 years ago
zhengyongxing a1df3c547e 编辑汇率时间控件修改 4 years ago
廖金灵 7576434beb Merge branch 'feature/market_percentage' of wmtx/platform into release
时间控件修改
4 years ago
zhengyongxing 5dc5222091 时间控件修改 4 years ago
郑永星 7608fb3b99 Merge branch 'feature/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing c637d7a1d7 离职发放发放完成隐藏 4 years ago
廖金灵 6d6ec065b2 Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
4 years ago
ELF a17bb698dc 修改bug 4 years ago
廖金灵 39af00fe0e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改bug
4 years ago
ELF 2dadc11d09 修改bug 4 years ago
廖金灵 578087e50e Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改留存率
4 years ago
ELF fa4de7ece5 修改 4 years ago
zhengyongxing 585f523984 arpu分析bug修正 4 years ago
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 4 years ago
zhengyongxing f4789a1534 市场专员业绩提成bug修正 4 years ago
zhengyongxing 3603f5fa21 市场专员业绩提成bug修正 4 years ago
zhengyongxing 944a424b3c 市场专员业绩提成bug修正 4 years ago
zhengyongxing 44feb6957d 市场专员业绩提成bug修正 4 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 4 years ago
zhengyongxing b9255647f7 市场专员业绩提成汇总单检索
修正
4 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 4 years ago
zhengyongxing 5c76d1180d 市场专员业绩结算结构修改 4 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 4 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 4 years ago
zhengyongxing 8053806801 市场专员业绩bug修改 4 years ago
zhengyongxing f7c11991ca 市场专员业绩bug修改 4 years ago
zhengyongxing 2303c439aa 市场专员业绩计页面修改 4 years ago
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time 4 years ago
chenzhi 63054ac0d8 优化订单校验 4 years ago
zhengyongxing de3d7d52b7 市场专员业绩计bug修正 4 years ago
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage 4 years ago
zhengyongxing 043ee29f54 市场专员业绩计bug修正 4 years ago
zhengyongxing 8430444b8e 市场专员业绩计bug修正 4 years ago
zhengyongxing 2da9821caf 市场专员业绩计算修正 4 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 4 years ago
zhengyongxing ea21948984 支付渠道bug修改 4 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 4 years ago
chenzhi c18eb439c5 优化游戏获取逻辑 4 years ago
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 4 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 4 years ago
chenzhi 048931ce9e 优化搜索3 4 years ago
chenzhi 35380ae9b0 优化搜索2 4 years ago
chenzhi 587d7913ca 优化检索 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
chenzhi 490197a490 移除合作方合同时间限制 4 years ago
ELF 3f42d2967c 修改 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
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