Commit Graph

2707 Commits (296b5a0d8f2ef078e4875eca6ef67eb8e0356cb7)

Author SHA1 Message Date
chenzhi 296b5a0d8f 优化关系函数
chenzhi 3349304e10 新增上游预警金额读取
chenzhi d6ec8e0248 新增导出
chenzhi 2a4541569d 优化列表显示
chenzhi 04e13844c3 zancun
chenzhi c9d6b9859d 合并热更
chenzhi c18eb439c5 优化游戏获取逻辑
chenzhi 048931ce9e 优化搜索3
chenzhi 35380ae9b0 优化搜索2
chenzhi 587d7913ca 优化检索
chenzhi 5fc03a14a4 优化cp添加
chenzhi 0dda3b1c61 优化合同不需要限制时间
chenzhi 490197a490 移除合作方合同时间限制
chenzhi 03f4130e9e 新增上游合作
ELF 3f42d2967c 修改
chenzhi d52ab03714 新增推广公司游戏选择
廖金灵 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 优化游戏分成比例不受档位限制
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
ELF e3b53e7df1 修改
ELF 73f5f4f5ea 修改
ELF 38c10a0f7a 修改
ELF 10aed50db7 修改
ELF f9b054e1cb 修改
ELF 34691d6baa 修改
ELF f0a8b6bc3b 修改
ELF 6f2f588617 优化