elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,290 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

1212 Commits (66794624921ee6af58cccef2f9cd9ee6d75ba3a9)

Author SHA1 Message Date
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菜单添加隐藏
zhanglingsheng eaf1cb3f17 游戏区服联动修改
liuweiwen 6b1bbe4c20 数据授权修改
zhanglingsheng 47628f2981 游戏充值预下单
zhanglingsheng fb425d3e91 游戏充值预下单
zhengyongxing 21412df14e Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission
zhengyongxing 3aa3c3f66b 数据授权修改
zhanglingsheng e949a4a60b 游戏充值预下单
zhanglingsheng 95f7acd6ff 游戏充值预下单
zhanglingsheng 65e1ddbd93 游戏充值预下单
zhengchanglong 732ba257ec 修改身份证加密显示方式
zhengchanglong f88a5c7f6e Merge branch 'dev' into release-1.0.0
zhengchanglong 8a241cceb8 修改身份证加密显示方式
liuweiwen de7d34576d 添加数据权限 
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
zhengyongxing 2b336dd560 数据文件删除
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
chenzhi ff6c70e380 合并cz
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id
zhengchanglong 6851933966 新建分支
zhengyongxing d545c22c3b 数据管理功能提交
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 5df3a59df4 扶持发放添加导出功能
zhengyongxing 6f584f8323 数据权限功能提交
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
zhanglingsheng 5d01cb1ff5 游戏充值预下单
zhanglingsheng 6d2c4fc3a2 游戏充值预下单
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 62502f0732 游戏充值预下单
zhengyongxing e6c45bc494 推广补链导出修改
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
zhengyongxing 24dab9158b 管理后台bug修改
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3a20c68117 游戏充值预下单修改
chenzhi db6131a135 暂存
zhengyongxing 46538019d4 管理后台新开发功能修改
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww 
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
chenzhi ab29dafffc 补链旧数据脚本
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
zhengyongxing 8b2d04f986 管理后台新开发功能修改
zhengyongxing e2e685e8c3 管理后台新开发功能修改
chenzhi 60c7bdce34 新增补链时判断是否已结算
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新
chenzhi 1ccbd03a0f 超级签新增支付方式
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ad97083c9f 行为日志文案
chenzhi 0c62e80e67 优化总览表格高度
zhengyongxing f112364f63 超级签功能bug修改
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 1bf6adb6c7 优化用户列表默认时间
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liuweiwen 188abdcbdd 落地页视频置顶判断
zhengyongxing 7b12780d9c 管理后台新开发功能修改
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 1010fe2674 推广补链新增查询条件
chenzhi 3d672db381 推广补链新增一系列查询条件
ELF c451921b92 后台添加IOS打包方式选择
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 14644b44a2 落地页图片改为使用游戏截图
zhanglingsheng f8498638ad 游戏充值行为日志
zhanglingsheng f392ad4de0 游戏充值行为日志
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi df50ce6352 补链csv导出
liuweiwen c31ae44f79 落地页去掉App购买
chenzhi 5359e67860 优化补链记录为ajax
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
liuweiwen 04bd089bd9 上传视频格式提示
chenzhi f8cbe8d9ef 分开推广补链和补链记录
zhengyongxing fd187aa04f 白名单修改
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 70aab2f137 角色查询新增创角时间区间查询
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表
zhengyongxing fa393d9c90 管理后台新增功能添加
liuweiwen 563b672c21 加提示
liuweiwen 14258a01a9 前端判断上传视频的大小与格式
liuweiwen a1bdc4b936 提示
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen b0748243b9 编辑游戏-》上传视频
liuweiwen fb5d9afded 落地页视频上传和显示
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
chenzhi 768c03c78d 优化总览导出为前端导出
liuweiwen 522ba58a4d 推广公司
liuweiwen 59b1e3149e 管理后台-推广公司搜索
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi c2fb23f9a2 优化用户列表结束
chenzhi d948dee3df 用户列表优化3
liuweiwen 3c6ca71bb6 解绑手机
chenzhi 20ff424e52 优化用户列表4
chenzhi 03a03fd61e 优化用户列表3
chenzhi d4968e4c72 优化推广员
zhengyongxing 4df0f91f43 管理后台上传图片修改
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小
liuweiwen a7c5957201 推广公司管理
liuweiwen fd7481a940 风控管理样式调整
liuweiwen 93d46b74ae 样式调整
chenzhi 3f358bb818 优化用户列表2
liuweiwen 1693f7fa98 推广公司
chenzhi 4aa9ac6767 用户表优化1
liuweiwen d51725f1af 新增推广员时，新增推广所属公司
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改
zhengyongxing 30b3794ef4 管理后台导出数据bug修正
zhengyongxing 4f385a87c6 管理后台导出数据修改
zhengyongxing fbead8c3a1 推广补链导出修改
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi d48b0f1341 优化统计
zhengyongxing 65fd27fe36 导出修改
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改
chenzhi 25cb177aea 新增游戏区服开服预告
chenzhi dbc77d07e7 优化聚合排序
chenzhi cfa67f9e3e 总览统计结束
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev
zhengyongxing ba85fc8c76 游戏充值导出修正
chenzhi e1c29c73af 总览统计结束
ELF 3e7382542d 打包区分ios新旧包
liuweiwen 97a7aa7437 落地页
liuweiwen 6c529e7bbd 统计
chenzhi e763abbf92 123.
liuweiwen b4745a357c Merge branch 'dev' into dev_lww
chenzhi 68d23b469c 123
chenzhi 6bc0cdcf1e 123
zhengyongxing 059742043c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenxiaojun 7de0b54773 推广平台->数据管理->充值玩家--更新
chenxiaojun 781d6d408a 推广平台->数据管理->充值玩家--更新
ELF 8d3d0ad726 Merge branch 'master' of 47.111.118.107:/srv/git/platform
ELF 4afe365e40 Merge branch 'hotfix/add_bans_type'
liuweiwen 56f2c422aa 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，（一句话简介）限制字数（最多30字）
liuweiwen 24ce610949 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，名词更改 — （游戏详情介绍）改为（游戏简介）
chenxiaojun 536ee9627f 脚本：用户推广员数据刷新
chenxiaojun 845df466f6 脚本：用户推广员数据刷新
chenxiaojun 968bf2c067 脚本：用户推广员数据刷新
chenxiaojun 71df93a12f 推广平台->数据管理->充值玩家--更新
chenxiaojun 0ea1cf04ec 推广平台->数据管理-充值统计|财务管理-结算明细--合计
chenxiaojun a7c80b84c2 脚本：用户推广员数据刷新
chenxiaojun 167e056f9a 脚本：用户推广员数据刷新
chenxiaojun 014a0e2f34 脚本：用户推广员数据刷新
chenzhi 1c9ed4b2ba 优化统计
chenxiaojun 73ca6f1f3f 推广平台->数据管理->订单查询--更新
chenxiaojun 83267e230a 推广平台->数据管理->数据管理->订单查询--更新
chenxiaojun 6cce4d7e05 推广平台->数据管理->订单查询--更新
chenxiaojun 1af46a74ee 推广平台->数据管理->数据管理->订单查询--更新
liuweiwen 466153f51a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 16d91ec2ee 后台游戏评分限制
chenzhi 9962366ab9 暂存修改
zhengyongxing 2cc68f3086 Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev 
 Conflicts:
	Application/Admin/Controller/StatController.class.php
zhengyongxing 245e07fc3f 设备统计脚本bug修正
chenzhi c178de254b 合并dev
chenzhi ce20d48d57 总览-推广员聚合及展示
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev
ELF f3f497a21d Merge branch 'hotfix/oldpack' into dev
yulingwei fa9d40f87a 新增风控标识
zhengyongxing ad8dd94e32 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liaojinling 3cfce8675e 修改每分钟打包数量
zhengyongxing 57ca1269d6 登录导出优化
chenzhi ae03347437 123
chenzhi 74ff06d549 优化首页折现统计数据
zhengyongxing 56d3718c14 用户登录记录
liuweiwen b61587868b 上传广告图片
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常
zhengyongxing 9e26a06ed2 统计bug修正
zhengyongxing e8477373ff 定时脚本bug
liuweiwen 3dddaf247d 后台还原游戏充值导出
liuweiwen b764260647 后台上传官网附件
liuweiwen 790b49c95b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 192ad84897 后台-》平台币充值导出时间
chenzhi 81e56063c7 优化取消补链提示
zhengyongxing 9abca632ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/Controller/ExportController.class.php
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 14f69c408e 登录记录导出
zhengyongxing fd15fde141 登录记录导出修改
chenzhi d64b627883 游戏充值新增文字说明
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错
chenzhi ef25027213 补链新增切分时间
chenzhi f09ee94952 优化补链参数
chenzhi dd22e6d0e9 修改补链in/out
chenzhi 1d4c1accde 123
liuweiwen 6ca5b80d18 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev
yulingwei 7a767466ef 锁号优化
zhengyongxing 34d424887d 绑定币
zhengyongxing 1881d11d09 绑币收回修改
ELF 5737c714b1 修改
ELF cd060a42a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3d3062dd8c OA
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 728f78db09 OA关联切换正式
“用lww 2eadac6b53 后台-》统计-》流失分析优化
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 793c1501ba 修改
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8f36f7204f 优化首页显示
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新
chenzhi 31fa9fe1f1 123
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
“用lww 75e2eda083 后台-》统计-》流失分析优化
zhengyongxing 1caece3034 充值汇总修改，用户导出修改
chenzhi af593e4326 优化首页折线统计统计方式
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi dfff8b6240 优化推广员选择
zhanglingsheng ede4cdd96e 短信配置
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3f8168c11a 添加新短信
yulingwei 0965c480a3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei e8ed8f808b 修改修复脚本
zhengyongxing 7d70f856ce 用户玩家列表优化
chenzhi 8a7c6219ca 新需求 充值-游戏充值新增两个字段显示
zhanglingsheng 864e2e5de1 OA
chenzhi cd9363f9fe 优化游戏及推广员统计
“用lww 68b75f258c 后台-》统计-》流失分析优化
zhanglingsheng 473fd31be1 OA
zhanglingsheng 86f05872d2 OA
yulingwei 82556627f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 4e56f9e325 更新
zhanglingsheng a900e5ed66 OA关联
chenzhi 4f1bd88dc2 取消首页速度测试
ELF b720644b02 修改
ELF b08c7748c9 调试
ELF d1833dc406 调试
chenzhi b610845d20 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 4af962e5a6 首页测试
zhengyongxing 6dee3f5939 平台币统计导出
zhengyongxing 93043b3abe 平台统计导出
zhengyongxing 96df83ebfb Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复
zhengyongxing 4e78370f14 推广员充值统计
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复
chenzhi 3cde3f0a12 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题
zhengyongxing 5a80070b97 推广后台导出修改
chenzhi 3500cce032 [bug]角色查询 区服不显示
chenzhi 9e0f9990d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi bb09ef9005 [bug]角色查询区服不显示
zhengyongxing 2ae543ad7e 用户导出修改
zhanglingsheng 3e8cfab9d0 OA-关联-导出
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ceb50f20b6 优化用户列表数据
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng de3f6196e6 oa关联
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 507e579755 用户列表统计
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 086c95b826 用户导出修改
zhengyongxing 8f1d59aa39 平台币充值bug
yulingwei d8a59b5670 更新
chenzhi 63c27e62ca 123
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新
yulingwei c3955dceb8 更新脚本
yulingwei d95540c92c 登录日志修复脚本
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 3ee50bcfc0 upt
ELF 390f22894a 修改运维脚本
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 80b7142317 修改运维脚本
yulingwei 7c3a3bc0c6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2ab47c0864 充值方式修改
chenzhi 9e171f2ce2 优化统计
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ce21545360 oa-关联
yulingwei 12fb156306 优化脚本
chenzhi e27cdc8a38 优化所有统计
yulingwei be33c5c471 更新
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei bcc0b964b0 upt
zhanglingsheng e9e66fa8a0 oa关联
zhanglingsheng 0a9efe02ca oa关联
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4590988f95 oa
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei b9bc2a7162 更新
zhengyongxing 6fcdfd2f31 用户导出
zhengyongxing d45000e3cd Merge remote-tracking branch 'origin/dev' into dev
zhengyongxing 777352f1bf 平台币充值bug
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 1966e0a2e8 更新
zhengyongxing fc126c0bbf 平台币充值bug
zhengyongxing d6b50146ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing fb6177d187 平台币充值bug
zhengchanglong 965ad46dce 充值汇总导出BUG修复
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 7a873a9d98 平台币发放bug修正
zhanglingsheng 668e4d097c 推广员oa关联
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4915ebc70c 推广员oa关联
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei ee7bb128c0 修复
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng dcd9791f79 推广员oa关联
zhengyongxing ee65c37cb1 用户筛选条件修正
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng e59352edbf 推广员oa关联
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整 
自动脚本->玩家角色充值数据统计--调整
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 988bf99086 ss
zhengyongxing 6e151dd8a4 用户导出修改
zhengyongxing 30b5e6ed46 用户玩家列表导出优化
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng c4e2d0a245 推广员OA关联
yulingwei 9a3bb4e170 修复排序问题
yulingwei b1902e5592 更新
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 466dd6cc93 upt
zhengyongxing c73ce833f4 用户导出修正
sunke 1d2ce27736 登陆日志排除下线日志
zhengyongxing cc4a071194 用户信息大数据量导出错误
chenzhi b52113622d [bug]无法获取上线推广员问题
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev
“用lww f75188f952 后台导出功能增加内存限制到512M
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计
“用lww e1b93a987b 导出数据过大，配置加大内存限制范围
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
tpingzhang a0ab440e1a 后台防沉迷配置
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang f9307ee710 后台防沉迷配置
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8bb10aea61 [bug]玩家列表累计充值
tpingzhang 704dd789eb 后台防沉迷配置
tpingzhang da794baa96 配置写到数据库
tpingzhang d176d51c5c 配置写到数据库
elf@home dc6790b404 修改
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 342ec9130e 修改
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 200d9e8667 修改bug
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12362190e6 upt
chenzhi 86b53d375c [新增]玩家列表汇总统计
chenzhi 0ca7d2f5d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ea580a52fe 隐藏推广员统计的二级页
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing ae18f1fb24 推广员统计修改
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
zhengyongxing 8e18e8faac 推广员统计官方渠道添加
chenxiaojun 5fcad13fce 根据时间统计玩家充值
chenxiaojun 2123b29479 根据时间统计玩家充值
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
yulingwei 8fee02fc4c 修改时间
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 849fd77ac6 优化推广员统计的方法
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
zhengyongxing 5c97bb7610 数据分析bug修正
zhengyongxing db40381bb1 定时器接口时间区间修正
zhengyongxing 4f27c2fb29 统计bug修正
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c0f19228d2 修改bug
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev 
# Conflicts:
#	Data/update.sql
chenzhi df03c05651 修正统计bug
zhengyongxing 118f706440 脚本去除部分输出
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
chenzhi 2a417c2746 123
ELF 2254610041 修改bug
zhanglingsheng fb85d32c87 合并分支
yulingwei 38680ddb05 更新
zhengyongxing 1626123074 数据统计7日平均时长修正
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi a6f52ccdb8 优化注册管理员提示信息
zhanglingsheng a514e5b5dc 支付方式添加快捷
zhanglingsheng e07e1ff2aa 支付方式添加快捷
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
sunke b64882554a 管理后台增加资质审核检索
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
chenzhi e1739209e3 1
chenzhi 521a343fc3 123
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz