Commit Graph

1096 Commits (3b681670dfe41a056130940787e54495214bb8b1)

Author SHA1 Message Date
sunke f8c4f2c0b6 更改下载权限
ELF b2df7e0fe3 修改bug
ELF fbce375679 修改bug
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 3d46a55811 修改bug
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
ELF efd2ed361f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c88892ec59 修改
sunke 2e37b23f2b 权限控制
ELF 84b36e2d78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 784de48bf9 修改bug
jbrazz 8be3ee9560 upt
jbrazz 31948423e0 upt
jbrazz 20c168a537 三级改四级配置
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev
zhengchanglong f1f7666e1e Merge branch 'dev_lww' into feature/promote
zhengchanglong 37bdcc60c8 Merge remote-tracking branch 'origin/feature/promote' into feature/promote
sunke 3b0a6a5479 promote
“用lww c20f08f9b3 pc端官网修改
sunke 7d474f09cd 推广员
sunke f592cd0b24 listsIndex.html
ELF fc028dd272 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF c2c8f11d01 修改
sunke c918864264 safeCSS
zhengchanglong 20d8be8807 Merge branch 'dev_lww' into feature/promote
sunke b94f7b50c2 ajax-get
sunke d2b1a474fb ajax-get
sunke 52dafe9ed3 remit
sunke 4fff44e0f8 汇款证明下载
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新
“用lww 7962cc62b4 pc端官网修改
sunke 908e552b81 base
sunke 129aa74f2e safe
sunke f39bff03c2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
sunke 246f1324f7 loginsafe
ELF 2b2d9d04de Merge branch 'feature/promote' into dev
ELF ae66feb819 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
sunke 856446087f safe
ELF 47e2706e26 修改bug
sunke d9c9271e17 del safe
“用lww cf78ecd0cc pc端官网修改
“用lww 9ef65ced5c Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.
chenzhi 484216ae65 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c11814f902 修改背景
chenxiaojun d57e4a211f 推广平台->财务管理->提现记录->结算单--更新
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 c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
zhengchanglong f21403a05b Merge branch 'dev_lww' into feature/promote
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新
sunke 4ea2029976 大小写
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
sunke 1d7597d468 修改大小写文件
chenxiaojun 93b2c65db5 推广平台->财务管理->提现记录->汇款证明--更新
ELF f049d4834c Merge branch 'feature/promote' into dev
ELF 1eebbeff5d 修改菜单
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
“用lww e019e23ca4 pc端官网修改
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev
jbrazz 3f1b2d34c2 upt
sunke e8d2879218 下载中心内容补充
zyx 68e57ab1f5 导出链路问题修正
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
sunke f948bfbb7d 下载器内容
ELF ad15ac9d1b 修改页面
ELF e1115d6632 Merge branch 'feature/promote' into dev
ELF 1fed7cdfc6 修改
ELF 6bf4e10916 Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev
Your Name a9a95765e2 OA获取信息-手机系统变更消息推送
ELF f03fec9e43 Merge branch 'feature/promote' into dev
ELF ed2fbea24c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 070cc2e7c2 修改bug
jbrazz e57dfd3fae 修改设备号查询
jbrazz f4a46335ca upt
jbrazz 7396e69a61 upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz 52880f1a91 upt
jbrazz ea4c861559 upt
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a819757cb 测试资源时间bug修正
zyx 0ce8984c13 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx ce008b284e 月结统计bug修正
jbrazz b21df0a8f4 upt
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
chenxiaojun c81abece71 推广后台->财务管理->结算明细--更新
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
ELF 09672d13b4 修改分包bug
ELF e853fc1c3e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF c6627a53c2 将plist demo写入php文件
chenxiaojun a29015937a 推广后台->财务管理->提现记录->结算单--更新
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
chenxiaojun e1fd669aa8 推广后台->财务管理->提现记录->结算单--新增
“用lww 0d83da8446 手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致
ELF bcc4b10bd6 落地页/下载页添加旧版兼容及链接黑名单
ELF 831456b333 解决冲突
chenxiaojun 258d1fbc1a 推广后台->安全密码|财务管理--调整
ELF 50c17baf8e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 2beec440db 修改bug
ELF 327bf6cd87 修改配置
ELF edc6a7be73 修改冲突
ELF 9abb4ebb2c 修改
chenzhi 7e37f3a2df 优化迁移用户addshifttask
jbrazz 9300280f78 merge feture/ylw
jbrazz 2dd1372b78 upt
jbrazz db1ea1370a upt
jbrazz 5e9cfb023f uypt
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
jbrazz 74be3407b1 upt
“用lww cb76357dae Merge branch 'dev' into dev_lww
ELF a8bc52df33 修改
“用lww 6d5bb2a9a1 手机官网-底部菜单高亮bug修复
ELF 65866d7fa1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 6f1e4551ac 修改bug
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
Your Name b54f73e4c2 OA获取信息
Your Name 31e90a9dee OA获取信息
Your Name f9eac7138f OA获取信息
ELF e0d542b5f6 解决冲突
“用lww 63d99584ed Merge branch 'dev' into dev_lww
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
ELF 2f4cd4c101 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF f056143dee 修改bug
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角色聚合
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
“用lww 631a635dfe 还原新版本
“用lww 4edd0bac4a 修改
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 导出加大默认内存
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
ELF d79da20c28 Merge branch 'hotfix/media' into dev
ELF 3d88a82794 回滚官网
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev