Commit Graph

4752 Commits (a0b04cf81e6994f2340600b596fce59a9a725809)

Author SHA1 Message Date
chenzhi a0b04cf81e 优化公司为模糊搜索
chenzhi 41f214c7e7 优化基础参数
chenzhi 5362c1e9e4 优化批量导出
chenzhi 2104a3e4b6 优化批次号
chenzhi 9cbcbc7013 优化打款
chenzhi 9ff3153f57 打款ok
chenzhi 9292aa7862 优化打款
chenzhi 9cb0e33531 znac
chenzhi 74e39c7b20 excel打款列表
chenzhi 24f2b76bd6 新增导入
chenzhi 399c3b37cf 新增文件读取
chenzhi 8d32b5104e 新增excel打款
chenzhi c11266291f Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/change_cp_time
chenzhi 63054ac0d8 优化订单校验
zhengyongxing ea21948984 支付渠道bug修改
chenzhi c18eb439c5 优化游戏获取逻辑
chenzhi 048931ce9e 优化搜索3
chenzhi 35380ae9b0 优化搜索2
chenzhi 587d7913ca 优化检索
chenzhi 490197a490 移除合作方合同时间限制
廖金灵 89edac1fee Merge branch 'hotfix/market_name' of wmtx/platform into master
市场专员识别
ELF 3f42d2967c 修改
ELF 70c9e26ce4 修改bug
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
ELF ecc228409d 修改
廖金灵 ed9d193531 Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员充值换榜定时器优化
zhengyongxing 3128c079d3 推广员充值换榜定时器优化
zhengyongxing ef8d16fc6e 推广员充值换榜定时器优化
chenzhi bc75da8c14 解决冲突
zhengyongxing 15b9efcd7e 江息网络漏掉的修改
chenzhi f62cfca22b 隐藏推广公司分成比例
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
chenzhi 21a738054a 隐藏推广公司比例
zhengyongxing 39e2bce6dd 推广员充值统计提交
ELF 990a2bd206 解决冲突
chenzhi a020cb26df 新增不验证手机 己方
chenzhi 91ae987c3c 优化游戏比例分成无需大于
chenzhi 9dd4a507e9 隐藏模板批量操作
chenzhi f1824fd7b3 优化新增名称
ELF 7c3a001e25 修改
chenzhi 4fde001d4e 优化游戏分成比例不受档位限制
ELF 102e77267d 修改bug
chenzhi c76cf038cd 己方公司
ELF e94b6418f1 修改
ELF 8224cfb362 修改
ELF 77c692c44d 修改
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除
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
zhengyongxing 2fae4219df 公会统计去除
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql