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

2150 Commits (fd815ef5a6eace998d3e6b58907b514510faed9a)

Author SHA1 Message Date
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水
chenxiaojun ba9b5e33d1 更新
chenxiaojun d615a1402f 公会分成管理--更新
liuweiwen bbc1b05e1c Merge branch 'feature/group_type' into dev
liuweiwen b8e36847a3 cp对账系统退出
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev
liuweiwen 57a1d8ed8c 对账系统
zhengyongxing a51291216a Merge branch 'feature/group_type' into dev
zhengyongxing f36202486d 生成上游订单修改
zhengyongxing abfc54a0af Merge branch 'feature/group_type' into dev
zhengyongxing 2f1d5fbd38 生成上游订单修改
chenzhi 0f8da4afac 优化页面显示
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 41421a9b10 优化页面显示
liuweiwen 0fa27e9c03 Merge branch 'feature/group_type' into dev
liuweiwen ed706c1b86 公司信息管理加提示
zhengyongxing b735706006 Merge branch 'feature/group_type' into dev
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正
liuweiwen af28ff9155 工会归属查询
liuweiwen c7b9e2a7d6 Merge branch 'feature/group_type' into dev
liuweiwen a7e9f62367 对账系统自动登录
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev
liuweiwen 51844a824e 工会归属会长必填
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录
zhengchanglong a67ffa18d6 Merge branch 'feature/group_type' into dev
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新
zhanglingsheng 4043cc04e6 支付设置--添加支付限额
zhengyongxing ae2ad86247 Merge branch 'feature/group_type' into dev
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 3c9a828537 市场结算官方渠道检索修正
chenzhi 4cd3d5b618 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 864e8d693a 优化前端浮点数计算
liuweiwen 64cdea78a3 工会归属管理
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 5d593cf266 Merge branch 'feature/group_type' into dev
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengchanglong 73fb719628 Merge branch 'feature/group_type' into dev
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ac0405329f 优化编辑
liuweiwen 21ee77609c cp/工会对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Data/update.sql
chenxiaojun 6a8e58325c 更新
chenxiaojun bfc93e0626 公会分成管理--更新
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 4a53915c22 更新
chenxiaojun 82784f9da9 推广提现--更新
yulingwei 9fe9a47b6f Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun 56956d90de 更新
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun a6b9e5e39f 更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong 10f2caefca Merge branch 'feature/group_type' into dev
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun 2d0143a378 更新
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 437800b30b Merge branch 'feature/group_type' into dev
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 7e1b90fc19 Merge branch 'feature/group_type' into dev
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong ba4d2a4a2e Merge branch 'feature/group_type' into dev
zhengchanglong 941978bb07 【游戏】-【合作方管理】，联系人改为必填项，必填项前面加红色※号
chenxiaojun a0bcdb2c04 更新
chenxiaojun 08dd26f942 推广提现--更新
zhengchanglong 8144e3c50f Merge branch 'feature/group_type' into dev
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun 3a9a7177fe 推广结算--更新
chenxiaojun ad80923bed 更新
chenxiaojun 114cb2f7a5 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei 37156e0dce Merge branch 'feature/pop_rules' into dev
yulingwei ed9ddd2d67 修复检索问题
yulingwei 5cb129e95f 修复冲突
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑：参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传
liuweiwen 602fb33fcc 新增需求：管理后台-》系统-》扩展工具-》公司信息管理
yulingwei 249044b0de Merge branch 'feature/pop_rules' into dev
yulingwei 5542994e36 upt
zhengyongxing c6f798dc47 市场结算管理bug修正
zhengyongxing f124e4b7ff Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 7adb991d0e 市场结算管理上传
zhengyongxing ba158e6b9a 市场结算管理上传
ELF b6500f939d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 247f10447a Merge branch 'feature/account_safe' into dev
ELF 500d0fdc2c 后台管理系统登录后改变session_id
chenzhi 377bdaee72 合并gt
chenzhi ff67974413 修复获取推广员统计bug
zhengyongxing 5e14eaf4c9 新增市场结算管理完善
liuweiwen 50320be1d2 新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
zhengyongxing 4fb2806656 新增市场结算管理
chenxiaojun c8fd6309a7 更新
chenxiaojun f1e8811df3 推广结算--更新
chenzhi 5326ef28db 合并
chenzhi 94243a5ea6 修改update冲突
chenzhi c711601fdf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 216321f46b 优化换绑逻辑判断是否订单在审核中
zhengyongxing 89883d2005 新增市场结算管理
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
万盟天下 e6d4304d74 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
还原补链限制
chenzhi dfdad21d8e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 414f326cf4 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f1a48fbdaa 权限分配 — 未给下级渠道分配（游戏充值）查看权限时，页面展示（游戏充值页面）修正
chenzhi 1295857697 优化工会统计各级检索条件结束
chenzhi 0561d8ff15 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f95d23b091 优化公会统计各级条件展示
ELF 6b7d1b9b51 Merge branch 'feature/add_cdn' into dev
ELF fe68d8e8c9 修改oss上传返回结果
liuweiwen 4892db340e 管理后台-》游戏-》合作方管理-》列表增加字段联系人，联系电话，邮寄地址。公司税号，收款方名称，银行账号，开户行
ELF b220ac1c7f Merge branch 'feature/add_cdn' into dev
ELF f472f5e9d3 文件保存改成cdn
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索
chenxiaojun 09f2ca4ab6 更新
chenxiaojun 962c284467 推广结算--更新
liuweiwen fa3adf2e0b 新增合作方时，新增录入内容 
新增联系人，联系电话，邮寄地址。公司税号，收款方名称，
银行账号，开户行
chenzhi c20d507df6 优化订单判断
chenzhi 9faec272e3 优化订单判断
chenzhi 3e54338685 取消多个推广员无法补链注释
chenzhi 3f53bc266b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 878badef43 换绑新增判断渠道是否已经结算
chenzhi bb7e1c269c Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 89965bd8fb 导出
chenxiaojun a636c2dcf6 导出
zhengchanglong 715abb2b3e Merge branch 'hotfix/fix_get_gameist' into dev
liuweiwen fe0f308e54 财务管理下的ajax请求不判断权限
chenxiaojun ba1f6565cc 更新
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun d792e34348 结算管理--更新
chenxiaojun 90eed6f5ca 结算管理--更新
chenxiaojun 461e80bd30 结算管理--更新
chenxiaojun 3faf5db4f7 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun c074b5fb86 结算管理--更新
chenzhi 3840959f05 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 9cef29ebeb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenxiaojun 4721e60d32 推广员资质认证
chenzhi 4ba400fa78 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 14fa967f00 优化推广员统计数据
chenxiaojun 0ff9f77181 推广员资质认证
zhengchanglong 7c1593e0e1 Merge branch 'feature/group_type' into dev
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
ELF 7c5b3bb5e7 Merge branch 'feature/account_safe' into dev
chenzhi 0f7134c838 游戏充值 区服名称改区服id
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
ELF 0a0cedafd5 各个系统登录提示安全优化，sessionon_id变更
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 0b3ae062b1 优化：推广员新增与编辑的推广公司增加万盟天下科技 
新增需求：推广员增加工会归属和工会关系属性
zhengyongxing 10f6caddfa 工会统计新增内外团占比
ELF 8ab02a5e0b 还原补链限制
廖金灵 b12b133a06 Merge branch 'hotfix/shift-player' of wmtx/platform into release 
修改玩家迁移限制
elf@home 0bc50cbf70 修改限制
zhengyongxing d842a5c468 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing e9ffc0af79 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
chenxiaojun 6054b5f6c0 更新
chenxiaojun 0baf97f717 会长提现--更新
zhengyongxing 0068a0d1c4 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing f324567258 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
zhengyongxing 346bbaa117 平台币充值添加推广员充值搜索修改，玩家列表时间检索非必填
chenxiaojun 5930642f8b 更新
chenxiaojun a12c3ecf9e 会长提现--更新
yulingwei c5f737cb0b Merge branch 'hotfix/login_crontab' into dev
yulingwei 25606949f5 修复登录统计问题
chenxiaojun e884214546 会长提现|公会分成管理--更新
zhengyongxing 8652c19f5c 平台币充值添加推广员充值搜索
chenxiaojun c329ec09f4 更新
chenxiaojun 0758062837 会长提现--更新
chenxiaojun 73537c120e 更新
chenxiaojun 35ea788ed0 公会分成管理--更新
chenxiaojun 936240d06a 推广结算--更新
chenxiaojun 15174f8547 推广结算--更新
chenxiaojun 311aeffbb7 推广结算--更新
chenxiaojun 053417f7f8 推广结算--更新
chenxiaojun cda8e4c1c0 推广结算--更新
zhengchanglong 0e5be6e4a3 Merge branch 'release-1.0.0' into dev
chenxiaojun 5a0769eb3b 更新
chenxiaojun e447159971 公会分成管理--更新
chenzhi 4d0606d6fc 新增渠道查看公司联动
chenzhi f594e3bb14 公会统计新增公司联动
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen 6625eaa4f7 工会统计
liuweiwen 809e9d36f1 工会统计
liuweiwen 28a1efe2f4 工会统计列表数据与搜索修复
liuweiwen b3e32506cc 工会统计搜索公司
liuweiwen c44e5ee1a7 编辑推广员时，只允许会长修改推广公司，同时更改底下推广员的公司
zhanglingsheng 7a9fe4fb45 超级签统计--导出
zhanglingsheng 34020fd725 超级签统计--样式
yulingwei 9d5bfc5ef2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e3ef73e7e3 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng e709816781 补单记录
yulingwei 75d3e87f89 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 899877e872 同步修改
ELF 834115c213 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 561787a4ac 修改
zhanglingsheng 8a9e0a9a8b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ca401adbd0 补单记录
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev
chenzhi 04c560312f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 715a1a8a2c 优化推广统计区服问题
yulingwei f4495f93a9 ltv修改
yulingwei 3ec7ccc188 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 873c81605e 修复
zhanglingsheng 908de1336f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng b88f395c9a 补单记录
zhanglingsheng 6a28abedc0 补单记录
chenxiaojun 905769f922 Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 9a0313b763 公会分成管理--更新
sunke 453c0c3682 链接归属名词修改
chenxiaojun e66893dc7f 公会分成管理--更新
yulingwei 8ccde7749a Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 3e11b4d0ad 更新
yulingwei 1e3079870e Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei ee18eac375 修复
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
yulingwei 21cc6865d5 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 2ed2117b6d 更新
ELF ad67717292 Merge branch 'release-1.0.0' into dev
yulingwei e2ed862130 Merge branch 'hotfix/ltv' into release-1.0.0
yulingwei 7d1808a7bf Merge branch 'hotfix/ltv' into dev
yulingwei 12f00ad268 修复
chenzhi a5c926b2cd 优化区服预告区服选择
chenzhi ff46ab04ca Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f580b44289 优化推广员统计区服选择
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填
zhengyongxing e49ed7aa30 支付渠道统计计添加平台币直充金额说明
sunke dcf7efad6f 下载链接菜单显示bug
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 2f25386518 游戏充值统计检索条件修正
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 9bf45ae0d3 修改
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正
chenzhi 1d69c616d6 优化公会统计页面跳转问题
chenzhi f38e007d80 优化渠道的公司检索
chenzhi 47595c81b8 优化公会统计公司
chenzhi c590b948ef 优化推广员充值统计导出
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi fd23b640ea 优化推广员充值优化代码
zhengyongxing 7c7971d48e Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正
zhanglingsheng 162e2fe19c Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 5b81f89308 游戏编辑
zhengyongxing dd86fbaddf 支付渠道统计bug修正
zhanglingsheng eabf59d3e3 超级签统计
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 4e3206a5c1 支付渠道统计bug修正
zhanglingsheng 1c2bb7e584 超级签统计
zhanglingsheng 08e98945ed Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng ae2b498e45 超级签统计
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 9b65fbaabb 超级签统计
chenzhi a61e0f36b5 优化注册统计今日本周本月不变
zhanglingsheng befc2ef62b 超级签统计
zhanglingsheng 244e036a21 超级签统计
zhanglingsheng 153c397cf6 超级签统计
ELF a167c51582 Merge branch 'dev' into release-1.0.0
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev
yulingwei 65ed103d3a 修复beta链接格式
liuweiwen 4c327a679a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 
# Conflicts:
#	Application/Admin/Controller/ExportController.class.php
#	Application/Admin/Controller/PlatformController.class.php
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
zhengyongxing b0899f3fc9 支付渠道统计bug修正，官网与推广后台充值计入平台币
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 24c2ea0031 优化区服预告的区服选择
yulingwei 53b4bfa0b8 Merge branch 'feature/ltv' into dev
yulingwei 30922605e2 修复
yulingwei a851b31cb6 Merge branch 'feature/ltv' into dev
yulingwei 6671565b5e 修复问题
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev
yulingwei 931893640a 修改问题
chenzhi fe06fded2a 优化区服列表，隐藏操作，新增id
zhengyongxing c1e16ed8d4 推广员充值统计汇总为当前页面的总额，改为所有数据的总和
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除
zhengyongxing 79f74dfbd4 支付渠道游戏订单导出bug修正
ELF ea15b6427c 修改落地页
ELF bf5ad7aa85 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 7f6730a562 修改留存率bug
zhengyongxing f8092fa9e5 支付渠道游戏订单bug修正
zhanglingsheng 3a7c4c9bad 超级签统计--合计
zhanglingsheng 6d34f317a1 超级签统计--合计金额
zhengchanglong 8fc5190830 Merge branch 'master_hotfix' into dev
zhengchanglong 56750b3829 Merge branch 'master_hotfix' into release-1.0.0
chenzhi 652b193f71 优化玩家列表设备号赛选
chenzhi 901d780165 优化公会弹框游戏选择
zhengchanglong a69c7c19ab Merge branch 'dev' into release-1.0.0
zhengchanglong f640531c0b Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 8615caa33f 游戏统计-搜索
zhengchanglong dc57a5e5f4 Merge branch 'master_hotfix' into release-1.0.0
zhengyongxing f8b570c20e 支付渠道统计bug修正
chenzhi 3561a87d4a 优化玩家列表数据
liuweiwen ed0283aff6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen d31c2f28f3 游戏统计
zhengyongxing 9b4ebd6c29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 7a98ee81cb 支付渠道统计bug修正
liuweiwen 93c5e311a6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 4f96c4728d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen c58f88fe7f Merge branch 'master_hotfix' into dev
liuweiwen 765188890b like 加前%导致没用索引
zhengyongxing 444c4e61f2 支付渠道统计bug修正
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
chenzhi 882fec0390 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi b4972959f7 优化公会渠道为空问题
liuweiwen 69013539cd 修改excel路径,自动跳过excel为空的行
chenzhi 769cbb9e37 优化玩家列表检索方式及导出
liuweiwen 1def746be4 修改excel路径
chenzhi 469db01864 优化玩家列表说明
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 82afa60d12 优化玩家列表导出2
chenzhi d3ccc3bb5b 暂存
yulingwei d172b0ec8b Merge branch 'feature/ltv' into dev
yulingwei 2f36d3eb1c 新增bata链接和开关
liuweiwen 78e1fefbc7 推广员账号判断
liuweiwen 600ac3fd9e 添加推广员时推广公司必填
zhanglingsheng 39f1ea9d0c 超级签统计--样式
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 12966e83bd 优化玩家列表数据显示规则
zhanglingsheng 35375a0c01 超级签统计--JS
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 3a3afa739c 超级签统计--搜索修改
sunke ec1cb552d0 落地页管理检索初始化
liuweiwen 9236c4135a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen fb4b017515 导出搜索时间修改
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
tping 127be94d60 充值补单
zhengyongxing 5f4b02b9c5 超级签订单菜单修正
liuweiwen 3244238849 修改文字
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动 
直充支出明细多条数据可滚动
chenzhi 34aac60bfa Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 44407cdb89 优化游戏选择公司联动
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 795c1983ad 优化官方渠道没有渠道查看
tping 964eea79e5 1, 平台币补单 
2，repair_pay表
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
chenzhi a6ad40b45a 公会统计新增返回按钮
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9549812c41 修复第二页数据不显示问题
zhengyongxing 65e13bbcc5 测试白名单bug修正
zhengyongxing 1922e29542 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 2d63204546 支付渠道统计权限注释
chenzhi 23306ba33b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 4ab8977f06 取消财务管理数据权限
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
chenzhi 9b7f3d1104 优化csv导出默认为不转码
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索
liuweiwen 491f8526bb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen aaabd0a07f 游戏统计搜索时间范围
zhengchanglong bf6a61f41d Merge branch 'release-1.0.0' into dev
liuweiwen b1e9127e9d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 7b87c7718d 游戏统计搜索时间范围
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev
ELF 67dd874ccf 修改
chenzhi 5f70aa78d8 优化补链记录
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Data/update.sql
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev
zhengyongxing 261adfa33c 渠道统计bug修正
zhengyongxing 6e5cfb72b4 渠道统计bug修正
zhengyongxing 4068c12480 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 3dbab290e6 Merge branch 'dev_statistics' into dev
zhengyongxing e506f45ed2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 44dac56d85 渠道统计bug修正
chenzhi 9dcc55d472 优化用户列表选择设备无响应问题
chenzhi 116dc2c86f 优化三角色说明
chenzhi 1f4490733a 优化推广员注册用户
chenzhi 0cec46ed37 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 8c577ec4af 新增平台统计说明
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cfd032b1fa 推广员统计
chenzhi 7a82b930bf 优化区服选择不响应问题
chenzhi 8b968fc9fb 优化区服选择无效问题
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug
ELF 8d934c8d88 修改
chenxiaojun 92b0bc2c87 公会分成管理--更新
chenxiaojun ec273ab157 公会分成管理--更新
zhengyongxing 66d098a81b 数据权限跳转提示去除，直接跳转
liuweiwen 3e5dbd6571 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时
chenzhi 0890e39675 公会统计首页新增分页
chenzhi 85e474c299 公会统计首页新增分页
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口
chenzhi cf89e73281 优化csv导出函数
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev
zhengyongxing a2c4e3f2e3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 792906e448 平台币充值功能添加
liuweiwen fcbd598e3c 管理后台登录时间改为1小时
zhengyongxing eb187fa8d8 超级签详情链接添加
chenzhi 629c733742 删除函数重复问题
zhengchanglong dba78c08cd 非管理员数据导出隐藏
zhengchanglong a45fde72dd 非管理员数据导出隐藏
chenzhi 0ef4241570 合并statistcs
zhengyongxing 09924a5cc3 超级签详情链接添加
zhengyongxing 5417e1751d 平台统计修改
zhengyongxing 32e362ab80 平台统计修改
zhengyongxing 8f1847341f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 6255d05472 平台统计修改
liuweiwen 0d088037da 登录记录查询强制索引
liuweiwen 5b1a4db378 登录记录
liuweiwen 2e818c04f8 登录记录搜索
liuweiwen 8a512aedc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen ab27c53da4 修改提示
zhengyongxing a7e747e639 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ac6f980d03 角色权限返回样式调整
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong 42542ff640 非管理员数据加密显示
liuweiwen eb6c65522d 修改提示
zhengyongxing 17e4084192 角色权限返回调整
liuweiwen 1ba7f6130a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cc1e3ccbb3 推广员账号已存在判断
zhengyongxing b8859837fb 登录数据权限数据
liuweiwen 2b4c9b6f44 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen dfa5316ef1 推广员状态默认为待审核
chenzhi 624e321b70 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 96e52b267a 修复没总览依旧显示问题
liuweiwen 2096c22826 注释
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录 
改为展示这个会长及其所属推广员的登录记录
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong 4d06b52b9d Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong c6b8f99b6e 非管理员数据加密显示
chenzhi b3e09ad5db 放行ajax,首页无权限判断
zhengchanglong 9a2a7df2e6 非管理员数据加密显示
chenzhi 700114cb4c Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi ae3e5d4048 公会导出结束
zhengchanglong cc6d095a1c 非管理员数据加密显示
chenzhi 2651a94408 公会导出2
zhengyongxing 10aa8cf81c 月结统计导出添加
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
zhengchanglong dbaf93b630 非管理员数据加密显示
liuweiwen e32491c108 bug修复，解决点击搜索框后下拉显示异常
ELF b36e1f1bc9 解决冲突
zhengyongxing d1a5b63be2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 71df0ab08b 菜单修正
chenzhi ba6947987b Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi e414013f8b 优化导出2
zhengyongxing 0a8865e335 菜单修正
zhengyongxing b8d736c337 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 00f33befa2 平台币收回修正
chenxiaojun 206c2ed251 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi c5dc3b4f22 优化会长统计导出1
chenxiaojun 1f19360d72 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 81fb39c004 管理后台>推广员管理>公会分成管理--更新
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计，增加判断是否有官方渠道权限
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
sunke 1699c155e8 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
chenzhi 7c81377095 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi cb99c63223 公会统计6
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮
chenxiaojun 2559aa32e9 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 6b8e277fb1 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 628ea84935 平台币收回修正
zhengyongxing 5daf1eb565 支付渠道查询修改
sunke 2f83a85690 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
liuweiwen 546a7029cd bug修复：游戏充值-》补单没权限提示内容为空的问题
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
chenzhi b743cd73e1 新增导出csv函数
chenzhi e4b6cdea85 公会修改6
liuweiwen 69e3843a56 修改文字
liuweiwen b8e5d719d5 修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
zhengyongxing ba59b41fb9 数据权限官方渠道添加
zhanglingsheng 2ec116a017 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng a9c2207ba2 行为日志
zhanglingsheng 837aec6659 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 855b567a02 行为日志
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的
chenzhi 1244156518 优化总览统计
zhengyongxing d465be8969 数据权限提交
chenzhi a877b475f5 优化总览脚本
chenzhi c6f2794a3b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f480cd6b7a 优化给推广员发放平台币时菜单问题
liuweiwen 21e90e6cb3 Merge branch 'dev_permission' into release-1.0.0
liuweiwen fe5ae6a499 搜索的推广员数据权限
zhengyongxing 153f731b55 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing e8c3f021b6 角色查询导出修改
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新
liuweiwen 4fca3e8288 修改返回按钮样式
chenzhi b97a956cbc 公会统计5
liuweiwen 511b780f72 返回跳转
zhengyongxing 7779535fb6 数据权限
liuweiwen ee98ca39bb 推广公司
liuweiwen ee2fc154a4 推广公司
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 904b707cf4 公会统计5
zhanglingsheng f3a80b73b8 行为日志显示bug
chenzhi 86db958ca7 将txt文件全部移入runtime
zhanglingsheng 043de55e0b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng c6a89f5fe1 行为日志BUG
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新
zhanglingsheng eaa5066324 行为日志bug
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 5f3e71e8a8 数据权限bug修正
zhengyongxing e7b2f57a93 数据权限bug修正
zhengyongxing ce0e9f943d 数据权限bug修正
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新
chenzhi 9104c0865c 公会统计5
zhengyongxing 3151e8b456 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ce58d63aa5 充值汇总bug修正
zhanglingsheng 7f9ec687cb 行为日志显示bug
zhengyongxing 69ad354ff7 数据权限bug修正
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
chenzhi 1450d05677 公会统计5
liuweiwen 0695a22472 导出数据权限
liuweiwen 96bf040f98 导出数据权限
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天
zhengchanglong e99e96dfb1 添加管理员生日字段默认今天
liuweiwen 62f5098df7 处理数据权限筛选时，不覆盖原有的搜索字段promote_id
liuweiwen a9a6b49148 空格
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新
sunke 4e737c3e6a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng b4f6c58e42 Merge branch 'release-1.0.0' into dev
zhanglingsheng df4f7fc511 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 375bbac885 行为日志
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新
chenzhi c05698e991 公会统计4
liuweiwen 4bf6352f9d 导出添加数据权限
chenzhi 6e97bd3bbe Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi b94fb8d794 公会统计4
sunke 5f24c670b8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
liuweiwen 31790a7e51 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限 
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
zhengyongxing 48437d25c2 数据权限导出修改
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 46c7c85b68 超级签详情样式
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev
yulingwei 63d945b4df 修改样式
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限 
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
yulingwei f33ec364c3 修复 in 问题
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev
yulingwei bc7c6b493c 修复问题
liuweiwen 4ed57dcda1 增加注释
liuweiwen 7f57b53646 渠道统计列表
liuweiwen af541bface 平台统计列表
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev
yulingwei 36b295919a 修复问题
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
zhanglingsheng 83ce328062 超级订单搜索导出
liuweiwen 279e6d4d81 Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics
zhanglingsheng c112391dea 超级订单搜索导出
liuweiwen cdbf059ee4 平台币直充明细列表，搜索，导出 
内充支出明细列表，搜索，导出
sunke 0d1e68e449 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新
zhanglingsheng cbbbf6350c 超级签统计--导出
chenzhi 28e13f4c76 公会聚合3
chenzhi 7f86924778 公会优化3
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新
yulingwei d1bc94e438 修改问题
zhanglingsheng b3a98a5f29 超级签统计
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 09ba38fc79 超级签统计
chenzhi 06742203f7 公会统计3
yulingwei cd34df0bda 修改时间统计
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev
zhengchanglong 25a4138842 扶持管理字眼改成资源管理
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
yulingwei 9f156f7be4 ltv优化
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源
chenzhi 929d5500c0 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi 33bf8c1ea7 公会统计2
chenxiaojun 8fd8ae006a 管理后台>推广员管理>公会分成管理--更新
sunke bafd5cf8d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/codemanage
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增
liuweiwen 53a235379a 游戏订单查看-导出excell
liuweiwen 750572bc21 游戏订单查看增加开始时间与结束时间搜索
liuweiwen 39e3350dd9 游戏订单查看
sunke 60f2c62fe6 下载链接管理后台
chenxiaojun 8261512ba3 推广平台>数据管理>充值玩家--更新
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev
zhanglingsheng 2a5dccdab8 游戏充值预下单
liuweiwen ead339046f 游戏统计
liuweiwen c0fac39c18 游戏统计
liuweiwen 5d6716b239 游戏统计
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新
chenzhi ff04347526 公会统计1
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 5040b78473 登录日志修改
zhanglingsheng 33c3fd1d0d 游戏联动查询
zhanglingsheng 31af192402 解决冲突
chenxiaojun 61bfbd00cc 公会分成管理
zhanglingsheng 6ddf42181c 游戏查询联动
zhanglingsheng 8f75d0f450 游戏
zhanglingsheng 24d47089dd 游戏预充值
zhanglingsheng 0e0f603d13 游戏充值预下单
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复
liuweiwen b3fcf58932 推广员编辑推广公司
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev
liuweiwen df1b878485 推广公司
liuweiwen d64d18144a 推广公司录入
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission
chenzhi da79ff4441 优化角色权限2
zhengyongxing deaeed6027 数据授权修改内容提交
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng a15e62988b 游戏预充值-导出
chenzhi 1623f3ae65 优化多会长统计1
zhanglingsheng 621776246a SDK菜单添加隐藏