Commit Graph

1611 Commits (b7fdcf38f691bfe6a67eaa23f6931032406067d3)
 

Author SHA1 Message Date
“用lww 8120d41204 Merge remote-tracking branch 'origin/dev' into dev_lww
# Conflicts:
#	Application/Common/Conf/seo_media_config.php
#	Application/Mobile/View/Index/introduce.html
#	Application/Mobile/View/User/login.html
#	Application/Mobile/View/User/recharge.html
#	Application/Mobile/View/User/step1.html
#	Application/Mobile/View/User/userset.html
#	Public/Mobile/css/common-cz.css
#	Public/Mobile/js/home.js
chenzhi 521a343fc3 123
“用lww 176aa70c8d 去除vbs代码
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenxiaojun 917b88af21 添加索引
chenzhi 3d85179abc 新增首页聚合统计
chenxiaojun fbed3ef1f7 添加索引
chenxiaojun 395cd01d0d 推广平台->数据管理->订单查询|注册明细--优化
chenxiaojun 0ec50eeee1 推广平台->数据管理->订单查询|注册明细--优化
sunke 52a668f546 异步时间
sunke c7804aa905 时间限制
chenzhi 2c582c7115 123
sunke 9dec8e702d 认证信息
chenzhi 15bd05a5af 123
sunke d2d211737f bug
sunke eac235d498 身份认证后台
sunke 8df42a80c1 bug
sunke 486be7e3ed bug
ELF afbdec3d5d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF a1c1cb44ae 修改bug
sunke bb1ce4bf14 bug
sunke 303a176f8b bug
ELF adb10b2959 修改bug
ELF 8d56157601 修改bug
ELF f322f98773 修改
ELF 01dfe50442 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 3092dcb237 修改
zhengchanglong 2d1d850468 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 1e2635cff2 手机官网修改
chenxiaojun bbe32dd3b2 推广平台->数据管理->每日概况|数据汇总--sql优化
chenxiaojun 936424a482 推广平台->数据管理->每日概况|数据汇总--sql优化
chenxiaojun e2b7d7edb0 管理后台->推广员->财务管理->推广提现--结算详情分
chenxiaojun 232760c351 推广平台->数据管理->每日概况|数据汇总--sql优化
zhengchanglong cfe66517d5 Merge remote-tracking branch 'origin/dev' into dev
zhengyongxing 392c42f356 数据管理玩家充值玩家账号加密
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev
zhengchanglong 00858df9fb PC官网修改
chenzhi b4a6119aaa indexset
ELF 0cbc9e5d8a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 7acf0e13bf 修改bug
tpingzhang a803b27918 ALTER TABLE `tab_deposit`
ADD COLUMN `pay_url`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '支付信息' AFTER `check_sign`;
tpingzhang 9fc38d81e3 创建消息未读记录
sunke e9b234df02 下载数据加密
tpingzhang 12a40d4ad4 增加tab_spend extend 字段长度到255
tpingzhang 4e273b375a 增加tab_spend extend 字段长度到255
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 94cc0bacbf SDK菜单链接修改
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
sunke 787d7573f0 bug