2130 Commits (309300299d533888d140610e22933e71d4c56c73)

Author SHA1 Message Date
zhengyongxing 043ee29f54 市场专员业绩计bug修正 5 years ago
zhengyongxing 8430444b8e 市场专员业绩计bug修正 5 years ago
zhengyongxing 2da9821caf 市场专员业绩计算修正 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing ea21948984 支付渠道bug修改 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 5 years ago
chenzhi c18eb439c5 优化游戏获取逻辑 5 years ago
zhengyongxing 1c535ee74b 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 5 years ago
chenzhi 048931ce9e 优化搜索3 5 years ago
chenzhi 35380ae9b0 优化搜索2 5 years ago
chenzhi 587d7913ca 优化检索 5 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 5 years ago
zhengyongxing 17ff8d9029 市场专员业绩管理模板指定 5 years ago
zhengyongxing 70d6c3c7bf 市场专员业绩管理权限判断 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
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
5 years ago
zhengyongxing 3128c079d3 推广员充值换榜定时器优化 5 years ago
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 5 years ago
zhengyongxing 1234349844 市场专员业绩计算修改 5 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 5 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
5 years ago
chenzhi 21a738054a 隐藏推广公司比例 5 years ago
zhengyongxing 39e2bce6dd 推广员充值统计提交 5 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
chenzhi a020cb26df 新增不验证手机 己方 5 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 5 years ago
ELF 7c3a001e25 修改 5 years ago
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制 5 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 5 years ago
chenzhi c76cf038cd 己方公司 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 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 2fae4219df 公会统计去除 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 e3b53e7df1 修改 5 years ago
ELF 73f5f4f5ea 修改 5 years ago
ELF 38c10a0f7a 修改 5 years ago
ELF 10aed50db7 修改 5 years ago
ELF f9b054e1cb 修改 5 years ago
ELF f0a8b6bc3b 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing a2408407b7 上传市场专员结算代码 5 years ago
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
5 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
5 years ago
chenzhi 7d8dca7421 取消测试的虚拟验证码 5 years ago
chenzhi 95d9f45612 新增检索 5 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
5 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 8c18f2aa1d 1 5 years ago
ELF 2d872ed710 解决冲突 5 years ago
ELF 2589806e62 解决冲突 5 years ago
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17 5 years ago
yulingwei 0decb03cb1 merge 5 years ago
ELF a153fb9a0e 修改 5 years ago
yulingwei 5b604ab073 upt 5 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 5 years ago
chenzhi c335c1f0b3 优化补点和月结集合 5 years ago
chenzhi bffc9a32f1 数据迁移 5 years ago
chenzhi 26ccc9c450 优化导出权限 5 years ago
chenzhi e96c6e8b52 公司获取优化 5 years ago
chenzhi 511f53e83c 优化权限 5 years ago
chenzhi d845ab35a3 优化新增结算 5 years ago
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance 5 years ago
chenzhi 4b29d159e1 取消备注 5 years ago
zhengyongxing b664ba46ad 汇总单代码提交 5 years ago
chenzhi 6c05756415 新增排序 5 years ago
chenzhi 9d8ed80fcc 优化新增重算 5 years ago
chenzhi 53b9513935 新增结算 5 years ago
chenzhi 53004adf5d 新增打款 5 years ago
chenzhi a2454e0446 取消结算单下游个人导出 5 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 5 years ago
chenzhi 0ba02069a0 优化补点计算方式 5 years ago
chenzhi ec641257b0 优化下游渠道结算 5 years ago
chenzhi fdccc92c43 新增只支持脚本访问 5 years ago
chenzhi 38ab488cd0 修复搜索错误 5 years ago
chenzhi 036a710f2f 修复不修改不重审 5 years ago
chenzhi a9723597f0 优化推广比例未修改重审 5 years ago
zhengyongxing f7f862fd83 官方渠道修改江息网络 5 years ago
yulingwei e09296d10d upt 5 years ago
chenzhi 265384f2c8 优化审核乱跳 5 years ago
chenzhi 994ee29b1d 优化审核列表乱跳 5 years ago
chenzhi ffb60d80a9 修复多家公司合作问题 5 years ago
chenzhi 701c421d0c 上级改为通知成功 5 years ago
chenzhi 31ef129b2d 修复己方公司不能删除 5 years ago
chenzhi ffee256f93 优化bug1 5 years ago