elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,973 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

4417 Commits (78a24c78f5946706b0bb52882d48a6a5ce44e68b)

Author SHA1 Message Date
zhengyongxing ec3491943b 12月功能提交
ELF b73b502a67 修改
zhengyongxing 52ff4a2bc6 12月功能提交
zhengyongxing 9bec07c7d4 不结算bug修改
zhengyongxing 747224dae9 12月功能提交
tping e79f18e618 1211 审核列表 甲乙方公司
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 
# Conflicts:
#	Data/update.sql
zhengyongxing 8bb8e4379f 12月功能提交
zhengyongxing b8af3ea384 12月功能提交
chenzhi 4f1bebc3af 优化游戏统计说明
zhengyongxing 7e41ad1e18 12月功能提交
zyx 6b0de87280 未结算接口修改
chenzhi 2bc72f9ae2 优化个人补点不修改公式
chenzhi 8d1f77537a 优化订单列表新增列
chenzhi a741e8d37d 订单新增设备类型
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
chenzhi 24f3489e65 优化导出新增公式
chenzhi 8d156ffb64 新增结算公式
zhengyongxing 166c1d63d6 12月功能提交
tping 31ce7b071c 1211
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master 
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
chenzhi d06cc0ea10 优化去除同公司奖罚
chenzhi 3053461ee5 优化奖罚排序
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master 
编辑扣款旧的验证添加
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加
zhengyongxing 10ddadece7 js字符类型修改成数字类型
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
zhengyongxing 923851fea7 11月bug修复
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master 
11月bug修复
chenzhi 943d63faac 优化财务汇总
zhengyongxing 564a2ec91d 11月bug修复
郑永星 3f7c20c3ab Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0e67e37436 11月bug修复
郑永星 e179d507e8 Merge branch 'feature/add_item' of wmtx/platform into release 
11月bug修复
zhengyongxing 0572fde5ad 11bug修复
廖金灵 3e27f09e7d Merge branch 'feature/add_item' of wmtx/platform into master 
特殊补点用户名修正
chenzhi a20285a42e 优化是否参与结算导出
zhengyongxing 08dd238ca4 特殊补点用户名修正
chenzhi e7cd32b2a2 优化是否结算参数
廖金灵 bfbac3b30a Merge branch 'feature/add_item' of wmtx/platform into master 
汇总刷新接口提交
zhengyongxing ef13761820 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others
zhengyongxing d6b8fa208c 汇总刷新接口提交
chenzhi 2890f3e820 优化订单查看
chenzhi 147cac3a9e 优化公会统计
chenzhi b9b497e255 优化公会结算
chenzhi 9ddfb6f794 现在参与结算筛选
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125
chenzhi 2d0bba8de5 优化修改推广游戏操作日志
chenzhi 7e1d2fb879 优化日志
chenzhi 5644570c1e 新增日志
陈志 4da7fa623f Merge branch 'feature/add_item' of wmtx/platform into release 
优化新增仅单参与结算是结算
chenzhi 5e9723b040 优化新增仅单参与结算是结算
chenzhi 74d9d6ed18 优化充值操作
郑永星 9a008d2bfc Merge branch 'feature/add_item' of wmtx/platform into release 
换行字数修正
zhengyongxing b54b37e99c 换行字数修正
郑永星 4262b55a66 Merge branch 'feature/add_item' of wmtx/platform into release 
市场业绩bug修正
zhengyongxing 59ec6c28ca 市场业绩bug修正
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release
chenzhi 73f8c16379 游戏统计修改bug
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留
zhengyongxing ed8d1fee0a 小数点保留
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release 
小数点保留两位添加
zhengyongxing b54b2660d4 小数点保留两位添加
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数判断
zhengyongxing 711992a287 保留两位小数判断
chenzhi eeb1821859 暂存
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release 
保留两位小数
zhengyongxing c829c56956 保留两位小数
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release 
内团去除比例结束时间减1
zhengyongxing 1717c2958b 最大值判断添加
zhengyongxing 4dd097667f 内团去除比例结束时间减1
郑永星 37d1419bb9 Merge branch 'feature/add_item' of wmtx/platform into release 
最大值判断添加
zhengyongxing ff21751d31 最大值判断添加
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
修改游戏统计bug
ELF e46cc5b52e 修改bug
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126 
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
万盟天下 4557b3dc2f Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
修改游戏统计bug
ELF 47fcab323b 修改游戏统计bug
万盟天下 41ab9703a9 Merge branch 'feature/add_item' of wmtx/platform into release 
11月功能提交
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release 
游戏统计/后台登录时间修改
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others 
 Conflicts:
	Data/update.sql
chenzhi 9da9941c9f 优化支付数据查看
zhengyongxing 3d1ab70123 11月功能提交
zhengyongxing 5c27c63835 11月功能提交
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master 
根据推广公司配置推广后台
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing 41e9820d83 11月功能提交
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 710439d8df 11月功能提交
ELF 289783eecd 修改
tping dd786dc27f 1126 批量上下架
tping b722175785 1126 权限
chenzhi 986065ab4b 优化名词
tping 033cd00aee 1126
zhengyongxing c749df4936 11月功能提交
tping d8924dc8be 1126 客服qq
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
tping 3471639489 支付通知 补单
tping 103acdd15d 支付通知 小数点后面.00
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
ELF 773068b57c 优化代码
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
ELF dd7068e3ae 改用redis存储session
tping 025d90f5fa 1126
chenzhi ad1d4e65a5 优化游戏汇总
chenzhi bea27fd5de 优化游戏汇总
tping c75d73c9f7 1126
ELF 6a50654045 游戏统计/后台登录时间修改
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master 
汇总bug修改
zhengyongxing e098384635 汇总bug修改
zhengyongxing 3656c555d1 11月功能提交
chenzhi ffd8c92940 优化奖罚
ELF 89332c0d54 解决冲突
ELF eef296ea08 发放资源自动审核/发放优化
ELF b92f564a49 发放资源自动审核/发放优化
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF d0b2e5f459 优化
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
chenzhi cdd1cd7d7f 优化页面页数
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
推广员信息显示通过权限控制
ELF 53f3ad6864 优化
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release 
市场专员信息显示通过权限控制
ELF dfdc31f4dc 市场专员信息显示通过权限控制
zhengyongxing 6021f91604 公会订单添加所属商户
zhengyongxing 3f04fa1507 公会统计商户名称修改
zhengyongxing deee3228dd 公会统计商户导出
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin
zhengyongxing 767ce5734d 市场业绩重算只重算上个月提交
zhengyongxing a3b86e9339 市场业绩提成修正
zhengyongxing d85ac9066d 市场业绩bug修改
zhengyongxing 6c005f01f6 市场业绩比例永久判断bug修改
zhengyongxing 48f4fef494 外团特殊比例自动审核通过
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过
zhengyongxing 324deba9c2 外团特殊比例功能提交
zhengyongxing 24f3cbc99e 外团特殊比例功能提交
zhengyongxing cf21a4f324 外团特殊比例自动审核通过
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过
zhengyongxing d73602d30b Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other
zhengyongxing 0155111706 特殊比例申请比例限制提交
chenzhi 3db0914108 优化导出公司
zhengyongxing b3658dfaa9 比例方法提交
chenzhi 833619518b 优化测试
chenzhi 9002ae24be 优化重算
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游
chenzhi d029e4562d 优化上游
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release 
优化上游pool
chenzhi 6f90b18be9 优化上游pool
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release 
内团推广游戏提示语修改
zhengyongxing 178f89f43b 内团推广游戏提示语修改
郑永星 a9f96722b1 Merge branch 'feature/add_item_other' of wmtx/platform into release 
外团推广功能提交
zhengyongxing 25e710c27e 外团推广功能提交
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release
tping e6ae117fd7 1,隐藏删除按钮（后台->推广->游戏分包） 
2,推广后台增加下单时间查询
zhengyongxing 0f44573fe2 市场业绩提交
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other 
 Conflicts:
	Data/update.sql
zhengyongxing ce3aa147e5 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing ccf27d77a1 市场业绩删除修正
chenzhi 9083471980 优化补点
zhengyongxing 295f86e588 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 7463222308 外团推广功能提交
chenzhi 3f6472e64c 优化下游个人补点
zhengyongxing e33b19d4b0 外团推广功能提交
zhengyongxing 4e8cb8dfe1 外团推广功能提交
zhengyongxing f569747948 外团推广功能提交
zhengyongxing f38b9026b5 外团推广功能提交
zhengyongxing f6f9437ed0 外团推广功能提交
zhengyongxing b0b893e51d Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 80b148d6c5 外团推广功能提交
chenzhi 6ce7377dc1 优化补点
zhengyongxing 859f5b58c9 汇总功能还原修正
zhengyongxing f450df3265 汇总功能修正
zhengyongxing 54a0fde480 汇总公司与上游回退
zhengyongxing 233fa89251 外团推广功能提交
zhengyongxing 38fb5398d1 外团推广功能提交
zhengyongxing 27c95792ff 外团推广功能提交
zhengyongxing def69bf6aa 外团推广功能修正提交
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据
zhengyongxing befa97e04d Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 96b296a4b6 优化比例为空
zhengyongxing 8340ddc115 外团推广功能提交
zhengyongxing c27315d3c0 外团推广功能提交
chenzhi ded1da96f9 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
chenzhi 7ade60fb02 优化比例获取
zhengyongxing a5c7c224aa 比例功能提交
zhengyongxing 823e241f2e 外团推广功能bug修正
zhengyongxing 97c33c8e1b 游戏比例公用方法修正
zhengyongxing 34b12ad382 定时器功能提交
zhengyongxing 5c497b94dc 分成比例导出修正
zhengyongxing 2dbb4a7940 市场部提示语修改
zhengyongxing c1b556b0b1 市场业绩排序修改
chenzhi 10d13472ec 紧急修复外团选择游戏
zhengyongxing 6ac5c1d524 比例逻辑修改
zhengyongxing 0c69c8f662 汇总结算结算时间位置修改
zhengyongxing 40664b5f8d 市场业绩功能修改，将不结算毛利以日来统计
zhengyongxing ba6323203a 模板比例bug修改提交
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加
zhengyongxing aa852a9a7f 外团推广功能金额修改
zhengyongxing f0cbe3cafb 周结算金额bug修改
zhengyongxing 86769746ef 外团可申请游戏bug修改
zhengyongxing e30cd2fea7 外团推广功能提交
zhengyongxing 5c57abc794 历史流水比例修正
zhengyongxing f8a7d53ac8 外团推广功能提交
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9c49d8bedc 外团推广功能提交
zhengyongxing 3855d8d3a9 市场业绩的功能提交
ELF 47ff398bf4 修改
ELF ffad0d78c5 修改
ELF 62d2eaef72 去除商户规则配置删除功能
ELF 3a4fb51222 修改支付商户规则bug
ELF e25f30d13c 修改
ELF dc5e032817 修改
ELF fe55de4aaf 修改
zhengyongxing 32b139a976 比例时间排序
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
ELF b44a5118cf 修改
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master 
测试资源功能提交
ELF 36c240c608 修改
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item
zhengyongxing d9b37792fd 特殊补点bug修正
zhengyongxing 6b47baf59a 汇总编辑前端修改
ELF ae3e49b95f 修改
ELF f77505925f 修改
ELF f3771dfd2d 修改
ELF a10bb888da 修改bug
zhengyongxing 4f35cacbab 汇总模板修改提交
ELF 36c4c666ec 修改bug
ELF 18c3e95f30 修改
ELF 8e4ba0e20e 修改
ELF c5fe80639f 修改
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出bug修正
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正
zhengyongxing 723b3c9fa2 汇总重算提示语修正
zhengyongxing e7b64f27f2 汇总重算提示语修正
郑永星 8d37653db4 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出公式添加
zhengyongxing ff46e189cc 聚合结算单导出公式添加
郑永星 a8c008923e Merge branch 'feature/add_item' of wmtx/platform into release 
汇总导出bug修正
zhengyongxing 053e8acb8f 汇总导出bug修正
郑永星 6cbc8e0102 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合汇总导出bug修改
zhengyongxing 1f31244d10 聚合汇总导出bug修改
郑永星 37dd11369e Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出bug修正
zhengyongxing ac5c1a199c 聚合结算单导出bug修正
廖金灵 e916641647 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合结算单导出个人与公司导出不相同
郑永星 ac14a6be90 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合结算单导出个人与公司导出不相同
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同
zyx b92ce713b3 聚合结算单上线
廖金灵 ef9a6d446b Merge branch 'feature/promote_level_sys' of wmtx/platform into master 
游戏统计bug
ELF 2b1980bfbd 修改
廖金灵 51e3863b82 Merge branch 'feature/add_item' of wmtx/platform into master 
导出公式添加
zhengyongxing f72bb66356 导出公式添加
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司汇总公司添加，公司绑定编辑开放
郑永星 cdcfc02614 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定参数错误修正
zhengyongxing 0d13b05dc0 公司绑定参数错误修正
郑永星 38eb0f4957 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 71826be2cc 汇总bug修正
郑永星 0fd8c71af0 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing ba74305974 汇总bug修正
郑永星 ed4297cb71 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing c711ef4b92 汇总bug修正
郑永星 d7edb41f44 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 01df95637a 汇总bug修正
郑永星 61d69eab60 Merge branch 'feature/add_item' of wmtx/platform into release
zhengyongxing f1308fce73 汇总bug修正
郑永星 b69bc8ef6a Merge branch 'feature/add_item' of wmtx/platform into release 
汇总bug修正
zhengyongxing 3f78880f7d 汇总bug修正
ELF 2ff1fc0041 修改
ELF 55466e44ee 修改
ELF dec6c4b222 修改权限
chenzhi f311da5208 优化银行卡号不限制
zyx a2d68a2752 汇总状态的操作修改
zyx 5bec0ba91c 汇总状态的操作修改
zyx c99cad808c 汇总状态的操作修改
zyx 4a7915ef69 汇总状态的操作修改
zyx d42cd15b0b 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
zyx 2c5889cd50 汇总状态的操作修改
zyx c692e51fa7 汇总状态的操作修改
zyx 52f4cbacb9 汇总状态的操作修改
zyx 178c86a751 撤销汇总添加退回审核状态
zhengyongxing 56593d5ee8 汇总bug修正
zhengyongxing dc5a65903b 汇总bug修正
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing 4210bb7bf0 汇总bug修正
zhengyongxing b4bdcd24fc 汇总bug流程修正
zhengyongxing e153fb66ca 聚合重新汇总bug修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master 
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master 
审核拒绝bug修正
zhengyongxing 7d3c8ebd61 审核拒绝bug修正
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master 
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release 
聚合公司绑定修正
zhengyongxing a977cf5f31 聚合公司绑定修正
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release 
特殊比例bug修正
zhengyongxing 0dd7bceb3f 特殊比例bug修正
ELF 19c782b053 解决冲突
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release 
汇总权限测试
zhengyongxing 6b486331b5 汇总权限测试
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release 
公司绑定修正
zhengyongxing f4f822d31a 公司绑定修正
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release 
绑定公司修正
zhengyongxing f757c10c61 绑定公司修正
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release 
小bug修改
zhengyongxing 0ebaf6ed64 小bug修改
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing c06e53ab31 汇总bug修正
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release 
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
zhengyongxing a1ac92dc02 押金bug修正
ELF 268ea4e34d 修改
zhengyongxing ce0196afea 押金bug修正
zhengyongxing 465f095dc4 市场业绩bug修正
chenzhi 7a8b91c8f0 优化下游同游戏判断
zhengyongxing 5c65f356b2 市场业绩开发类型修正
zhengyongxing 7a021dced5 市场业绩提示语修正
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item 
 Conflicts:
	Data/update.sql
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change 
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release 
优化删除游戏报错bug
ELF 24fe97186e 修改
chenzhi c40e366a03 优化删除游戏报错bug
chenzhi 02aa1bd088 优化1
zhengyongxing c9516b8751 未汇总汇总功能提交
zhengyongxing 4b44356a6d Revert "优化下游个人同游戏判断" 
This reverts commit f22dc90e
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位
zhengyongxing a86fab6bf6 聚合公司绑定功能修改
zhengyongxing 984619e310 汇总审批撤回bug修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
chenzhi f22dc90e96 优化下游个人同游戏判断
zhengyongxing 2cdc4e815b 下游公司cp比例修改
zhengyongxing 28f73f3140 公司比例格式修改
chenzhi 3ef485516f 优化工会游戏修改
zhengyongxing 995a860016 汇总编辑功能修改
zhengyongxing c366fcfe4e 汇总编辑功能提交
zhengyongxing 825d4e51c9 聚合公司绑定功能修改
zhengyongxing e8e190a7eb 聚合公司绑定功能修改
zhengyongxing 4e9bde9c10 汇总编辑提交
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改
zhengyongxing d937dbad55 聚合公司绑定功能修改
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加
zhengyongxing 14ad9ce93d 聚合公司绑定功能及汇总提示语添加
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加
zhengyongxing 868889fe54 汇总编辑功能提交
zhengyongxing 58bd48997f 汇总编辑功能提交
zhengyongxing bc627cf224 汇总导出bug修改
ELF ad34536256 修改
zhengyongxing 895b32cee8 汇总bug修改
zhengyongxing 60210fedef 撤销汇总名词修改
zhengyongxing 0b745ea817 个人汇总添加退款
zhengyongxing ee2304d664 结算性质名词修改
zhengyongxing fedcbd605b bug修改
ELF 6fcaa1362c 重置权限缓存
zhengyongxing ca03b8701f 聚合页面名称修改
zhengyongxing 518c902b2a 发起汇总修正
zhengyongxing ceef36a7d1 内部公司功能完善
zhengyongxing ab9be65422 内部公司功能提交
zhengyongxing 1f3b2d1ec7 Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item
zhengyongxing 0631c22c93 上游导出修正
zyx 570e476efb 公司添加是否为内部公司
zhengyongxing deeb4b865b 聚合汇总单代码提交
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change 
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 400a9b3ded 上游导出修正
zhengyongxing 3c698adba9 上游导出修正
chenzhi 97af14147e 优化下游个人结算
万盟天下 f52cf8947a Merge branch 'hotfix/bug_change_now' of wmtx/platform into master 
补点游戏生成多条及内充也计入
zhengyongxing cdb02aa821 补点游戏生成多条及内充也计入
廖金灵 ef891050c9 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release 
修改bug
ELF baba28fe04 修改
郑永星 55f98ca8c5 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
删除提示修正
zhengyongxing 623361cbde 删除提示修正
郑永星 77e8161159 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
汇总删除修正
zhengyongxing d35ce5694e 汇总删除修正
zhengyongxing f36469031e 删除修正
zhengyongxing c5e272fb36 删除功能修正
陈志 5cb1963582 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化推广公司添加排序
chenzhi f169d65c1c 优化推广公司添加排序
廖金灵 f850a45913 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release 
优化推广后台资料专区
ELF a6d7adb87b 修改
chenzhi 4a3cb6f6bb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
郑永星 7469d22c36 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
比例空字符判断
zhengyongxing 9579919375 比例空字符判断
郑永星 d272c17fc6 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
特殊补点比例修正
zhengyongxing c1222cd46a 特殊补点比例修正
zhengyongxing a5090c3793 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
zhengyongxing 7ef0f125c1 特殊补点删除功能提交
zhengyongxing 47e373639d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
廖金灵 6e34bf0dc0 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
公司支付宝打款修正
zhengyongxing ba1778c112 公司支付宝打款修正
郑永星 c7ba3e3ba3 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点bug修正
zhengyongxing ab7ae80634 补点bug修正
郑永星 2e4904861b Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
特殊补点功能bug修正
zhengyongxing 65dc1dec9e 特殊补点功能bug修正
chenzhi 7a135f1019 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
廖金灵 5e2c093ea4 Merge branch 'hotfix/payStatistic' of wmtx/platform into master 
判定是否录入过修正
郑永星 b65b8c6b2f Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
判定是否录入过修正
zhengyongxing 229d8d2a50 判定是否录入过修正
郑永星 a80f68ef5e Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点比例非负数修正
zhengyongxing df3b058b91 补点比例非负数修正
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master 
补点功能修正
郑永星 98563b686d Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点功能修正
zhengyongxing c7af3bdb1d 补点功能修正
chenzhi bcdbb3d0a0 优化导出保留两位小数
zhengyongxing c0406a6f52 上游导出修正
chenzhi e085b6cc78 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi f73a9033b3 新增下游个人比例
廖金灵 1b9aa5c87e Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点游戏有流水的就给予展示
zhengyongxing af5878a98f 补点游戏有流水的就给予展示
廖金灵 de3477dd27 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点功能修正
zhengyongxing b39629fe08 补点功能修正
郑永星 223c3a63f2 Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
支付渠道优化
zhengyongxing 64e2517b93 支付渠道优化
chenzhi 329c5696d6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总
郑永星 c9497ee3f3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 3adf8a93f8 比例格式修正
chenzhi e10b27a067 优化下游内团江息网络归属
万盟天下 956d6c35a7 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
优化
万盟天下 9d6b18009a Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
ELF 4bb7015e1b 测试
万盟天下 25c06c4b2d Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改功能
万盟天下 eb7346c4a9 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
权限优化
ELF f37f6c51dd 修改功能
万盟天下 c60d7c6671 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
上游导出修正
郑永星 1d3db74b53 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
上游导出修正
zhengyongxing 288078c959 上游导出修正
chenzhi 2ff538886c 优化上游结算
郑永星 700841fe7f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点与其他汇总重算功能区分添加限制
chenzhi 75c7b635b6 优化上游结算检索
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
特殊补点与其他汇总重算功能区分添加限制
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
万盟天下 e130228c39 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
万盟天下 2f0ecf6302 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
修改bug
ELF 8f4b86ee2e 优化
郑永星 7a9a12f99c Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点无法重算限制
zhengyongxing e94994993a 特殊补点无法重算限制
郑永星 c4ea44c3f8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点权限
廖金灵 ef5c95f49a Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
优化
ELF 1b949af7f5 优化
廖金灵 cf821ae447 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
特殊补点权限
zhengyongxing ba80668560 特殊补点权限
chenzhi 9c11344906 优化下游推广公司导出
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 1c08d1a221 比例格式修正
郑永星 10e50b4bec Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例与日期格式修正
zhengyongxing f18f3ce7e2 比例与日期格式修正
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
陈志 4813e28fec Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化汇总说明
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
小bug修改
zhengyongxing 5acd5197ae 小bug修改
chenzhi b899ff7af7 优化汇总说明
ELF bdc23b7d90 修改
廖金灵 a6bc59dd53 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
测试
ELF 1e5c0cca66 测试
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
优化
ELF 1fb2fa7e81 解决冲突
ELF 8d98bd5a36 优化
ELF d123f7b779 优化
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
郑永星 e554d9c288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点加入下游结算中
zhengyongxing 19c7f7db0d 特殊补点加入下游结算中
郑永星 1aebf2b939 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点分成金额功能修正
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正
ELF 268e084241 修改
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化重算按钮的出现
chenzhi ae9d7f7574 优化重算按钮的出现
郑永星 7c5ec40288 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点bug修正
zhengyongxing a29a8e43ff 特殊补点bug修正
chenzhi 175b2f92f7 优化绑定币搜索
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
ELF 9d67a4c842 优化
郑永星 e3850d18f5 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
平台结算导出与列表选项修改
zhengyongxing a146dd820a 平台结算导出与列表选项修改
chenzhi 8baab09004 优化备注
陈志 aa2feb7e1e Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化海南结算
chenzhi 927c5b8595 优化海南结算
chenzhi a3a3505894 新增官方渠道结算
郑永星 9f0f9b7951 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
市场专员业绩下游流水及特殊补点功能提交
zhengyongxing b14d2d197c 市场专员业绩下游流水及特殊补点功能提交
廖金灵 d29ec01ab6 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF b9779df6b1 修改
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
修改
ELF 0ff1089682 修改
廖金灵 c633109176 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
留存率不区分设备
ELF 619e1de3f3 留存率不区分设备
陈志 c1fbda369b Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化财务汇总测试收入
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
测试订单优化
ELF 3c3222ad26 测试订单优化
chenzhi eb2cd7d50f 优化财务汇总测试收入
陈志 3628dd630e Merge branch 'feature/company_export_change' of wmtx/platform into release 
上游导出修正
陈志 d130e6cf6d Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人汇总导出异常
chenzhi f405faa924 优化个人汇总导出异常
陈志 053d1de648 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化个人结算
chenzhi 1a55fbce69 优化个人结算
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
聚合订单查询
ELF a18e4188bd 修改bug
chenzhi 05f11648a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing ae8cf5ad38 上游导出修正
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release 
下游导出修正
zhengyongxing f0c425ae82 下游导出修正
郑永星 f0153776c3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例功能修正
郑永星 0010a39c76 Merge branch 'feature/company_export_change' of wmtx/platform into release
zhengyongxing 3c6418425a 上游导出修正
zhengyongxing 3b2ddded90 特殊比例功能修正
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
ELF 6596e01a29 修改
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other 
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
chenzhi 31af865a9f 优化线下打款确认
郑永星 3bc318daf3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊比例申请功能提交
zhengyongxing 418d5a6bda 特殊比例申请功能提交
ELF 6e2fda1e26 解决冲突
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release 
新增游戏自动授权
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
游戏统计/聚合订单数据相同
zhengyongxing 23555f8d4d 特殊补点功能修改
zhengyongxing 0215082018 特殊补点bug修正
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing cd331f2c64 上下游聚合打款信息修改
chenzhi 9234919180 优化导出
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 2c005d1996 特殊补点汇总功能修改
zhengyongxing 4ed51cb112 上下游聚合打款信息修改
chenzhi c795e5de6c 优化下游个人汇总样式
zhengyongxing f4aeae340d 特殊补点功能修正
zhengyongxing 565d3c9576 特殊补点功能修改
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化汇总导出错误
chenzhi ce5a83e9bc 优化汇总导出错误
zhengyongxing 50495e73ca 特殊补点功能修改
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing 872de1ff73 上下游聚合打款信息修改
zhengyongxing b75e0725a1 特殊补点功能修改
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改
ELF 1fbb9f097e ss
ELF 53f2649d9a ss
ELF 32bc839dcd 合并
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release 
优化上游添加错误
ELF e0bbec0978 修改
chenzhi 57b692cd67 优化上游添加错误
chenzhi 180332ab87 优化下游未汇总导出
ELF ad2037408d 优化
chenzhi 4a98c587fa 新增线下打款确认
ELF e441f030c0 优化
ELF e9038d7471 ss
chenzhi 69cf42e895 新增线下确认打款
ELF 9b88e97672 修改
ELF 296e378501 修改
ELF e4854aca3a 修改
chenzhi e2d179acd8 新增线下打款
zhengyongxing 9000533644 下游公司功能提交
ELF 1a14ed8dc7 修改
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 
 Conflicts:
	Data/update.sql
chenzhi b35d0a0e95 新增删除日志
chenzhi 79468aa6f2 新增结算删除
ELF 34a22d65bf 修改
ELF 42547128d4 优化押金
chenzhi 36d72848bb 优化市场专员
chenzhi a18df8c6fb 优化下游个人多比例结算
ELF 7adabb54f9 修改
chenzhi ed66facc8f 优化结算查看
elf@home c40fbf3870 新增游戏自动授权