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

3239 Commits (e8dea24f46cb0f24ce9917534e1e8d6aeb982718)

Author SHA1 Message Date
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