Commit Graph

1907 Commits (8bfe249251ca2f4f7736e7e89d5fe2af4c111065)

Author SHA1 Message Date
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 用户信息大数据量导出错误
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 修改
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 [新增]玩家列表汇总统计
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问题
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 统计数据修正
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 a6f52ccdb8 优化注册管理员提示信息
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
yulingwei 9ebc7d3655 upt
chenzhi e1739209e3 1
chenzhi 521a343fc3 123
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 94cc0bacbf SDK菜单链接修改
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2e0a8d2ad0 更新统计数据
zhanglingsheng 3453de757f sdk菜单配置修改
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步
chenxiaojun 6ad8277aa0 管理后台--更新
chenxiaojun 2e7ecfa53c 管理后台--更新
yulingwei a7f6d8b7a4 upt
elf@home 06486d458c 修改bug
elf@home 1036589f3b 修改代码
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化
chenxiaojun 83e8427c8b cs
ELF 1c11622eb2 修改bug
ELF b0b0056c43 修改bug
ELF e942f378c6 修改bug
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng fb0808445f 悬浮球加类型
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传
yulingwei 44954031bf upt
yulingwei 0d258c1d8d upt
ELF e2d75ec2c6 修改推广后台首页
yulingwei 6ea4c72416 修改部分导出报表问题
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 8a513767dd upt
sunke 9e2bb1e809 安全管理admin后台
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
ELF 784de48bf9 修改bug
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF afb6de56f8 添加3级变四级脚本
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev
jbrazz 3f1b2d34c2 upt
zyx 68e57ab1f5 导出链路问题修正
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
ELF f03fec9e43 Merge branch 'feature/promote' into dev
jbrazz e57dfd3fae 修改设备号查询
jbrazz f4a46335ca upt
jbrazz 7396e69a61 upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz 52880f1a91 upt
zyx ce008b284e 月结统计bug修正
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
ELF 831456b333 解决冲突
chenzhi 7e37f3a2df 优化迁移用户addshifttask
jbrazz 9300280f78 merge feture/ylw
jbrazz 2dd1372b78 upt
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi a653b46f0e 优化月份统计接口新增事务
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c2e686c38e 123
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 9d09fa4665 4角色聚合
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 9e9d742275 导出添加引号
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev
zyx 35e1b2631a 导出添加游戏订单号
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
chenzhi 0ae24bf2cd 优化财务聚合接口2
chenzhi 58c405e914 优化财务聚合接口
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi f54305911c 优化api暂存
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 7547e867bb 三级变四级修改
chenzhi eacdea6f9b 暂存修改
chenzhi 81192f36c8 xiufu
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 18be299b4c 同步dev
jbrazz 48b1cdf66f upt
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi f9397efebf 修改总流水统计方式
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出
chenzhi c8da11a12e 新增平台币流水充值
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 8212b4ecaf 4级推广申请资源修正
chenzhi 498de9ab75 同步dev
ELF 689cc08b69 修改
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev
zyx 1201180f79 游戏到处删除玩家昵称栏位
jbrazz 48de85a3c3 upt
chenzhi 02535dee01 dev
chenzhi 5b40ebdf91 dev
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
chenzhi b4b4e7bc00 新增强制重新更新
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
chenzhi c547d43330 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d91a44184f 优化数据更新提示
zyx bbc75a419d bug修正,样式更新
zhengchanglong fd97ecf494 Merge branch 'dev_zyx' into dev
chenzhi fa29554923 肯定没错
zhengchanglong d554815d12 Merge branch 'dev_zyx' into dev
chenzhi a1f22ad756 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 2e4067e1de 测试
zhengchanglong 3da91ecb0f Merge branch 'dev_zyx' into dev
zyx e8fc252599 组长统计搜索bug修正
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev
zyx 515ffa25b9 月结统计bug修正
chenzhi 3983a086ac 优化生成数据
chenzhi 8796458ead 聚合新增月份
Your Name 7466b90d13 SDK菜单修改
Your Name ed3ce2b4b5 SDK菜单修改
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name c90c397dd9 SDK菜单修改
chenzhi af05f08689 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 4f7077a3ec 10311331
zyx f16bf0b606 月结统计筛选列表逻辑修正
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx da1686fe14 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx ee5dccfaeb 财务管理功能代码完善
jbrazz d4c7727426 upt
chenzhi 185f0ca30e 优化强制更新
chenzhi 2983f5b93f 新增强制更新某月份
chenzhi e0857168f8 优化接口终结
chenzhi cce64d646b 1
zyx 82323a7138 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 54a01da982 财务管理功能完善
chenzhi 483ccdffa2 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 4cf967fbcd 优化数据获取
zyx d3de669837 '代码合并'
jbrazz 459b722c1c upt
chenzhi 06395bcb9d 123
chenzhi 3b70468942 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 9803b418b9 优化统计
ELF 5b62b99765 三级变四级
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计
zyx 24cdd7086b '合并代码'
chenzhi b41fbb05b7 123
sunke 021673f657 图片上传补充
chenzhi 50efce9315 更新spen root
chenzhi f6f47748bc 优化时间戳
chenxiaojun 28969fd024 管理后台->游戏管理->合作方管理->批量删除更新
chenxiaojun 19f10c574d 管理后台->游戏管理->合作方管理->批量删除更新
chenzhi b3f2069e94 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d273c5af27 spendAPI优化
sunke 692a1bcc11 webuploader插件
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx b39efb2d18 同步代码
chenzhi 1783cb0b71 恢复
chenzhi 28e15792e4 123
chenzhi d708a6302f 123
zyx abeb6acde9 git测试
zyx 2c4e20911e Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx
# Conflicts:
#	Application/Admin/Controller/FinanceController.class.php
zyx 882041495e git测试
chenzhi bee4544f70 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi c2c92b4c95 xiuag
zyx bedd841eda 财务管理功能添加
zyx 81c137a1bc 财务管理功能添加
chenzhi 3d38e78160 123
zyx 112316c395 财务管理功能添加
chenzhi 39a593b720 spend统计
chenxiaojun 20c8165888 管理后台->游戏管理->合作方管理->批量删除bug修改
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理
chenzhi b968702009 平台币
zyx d7c9744872 扶持号时间格式修改
zyx ae9a01f325 管理后台代码回滚
zyx 1ce876c39f 管理后台测试资源bug修正
zyx 96effb3525 管理后台测试资源bug修正
Your Name 6cb3a9ad75 SDK菜单
Your Name c1a9c3918e SDK菜单
ELF 6df44afb16 功能隐藏
ELF 437909d53a 测试
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
ELF 37ef999710 修改
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段
zyx c8f101f40c 管理后台添加测试资源
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
ELF 53e0395674 修改
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
ELF bcc34cbd0c 打包逻辑重构
Your Name 22e7866644 SDK菜单添加
ELF 69a6f9612f 打包优化
Your Name 2eff781166 SDK用户菜单
Your Name 118340fa33 SDK用户菜单
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Giftbag/add.html
zyx 90665c3dc5 新增礼包bug修正
zyx f4bc470156 资源日志bug修复
zyx 63eebf5611 礼包管理新增全部,超级签选项
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
“‘ b9bd9655b7 测试资源记录及发放
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置
18850253506@163.com 4a96cf7871 资料专区
ELF bfb7ce27f4 修改
ELF 29e4b4e501 测试
ELF ec2c9161e9 修改bug
chenxiaojun fc0053c6cd 本地分包删除
chenxiaojun fd8c59f114 本地分包删除
chenxiaojun 1f1954e9f1 本地分包删除
chenxiaojun d906527970 本地分包删除
ELF f6d15eba6d 修改bug
ELF a0cc11336e 修改bug
ELF cd58cecd3f 修改bug
ELF 1920d6ce67 修改bug
ELF 2f3bec1975 修改bug
ELF 1df8bd454f fixed bug
ELF bfadef687f 添加功能
ELF 2ffa024c4c initial