elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
908 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

190 Commits (320ebf1b6e0ec401b23179b21955b6e5040a918e)

Author SHA1 Message Date
zyx f16bf0b606 月结统计筛选列表逻辑修正
zyx 2adc07ec4a 组长月结统计页面文字修正
zyx 4803bd4a1b 组长月结统计页面修正
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx 1d59721ee2 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx da1686fe14 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx ee5dccfaeb 财务管理功能代码完善
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev
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 fe8a60093f 新增渠道模板提交
zyx d3de669837 '代码合并'
jbrazz 8859c847f6 upt
zhengchanglong 5c8573df37 修改月份列表
chenzhi 06395bcb9d 123
chenzhi 3b70468942 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 9803b418b9 优化统计
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 财务管理功能添加
chenxiaojun 20c8165888 管理后台->游戏管理->合作方管理->批量删除bug修改
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理
zyx d7c9744872 扶持号时间格式修改
zyx ae9a01f325 管理后台代码回滚
zyx 8b4bb3baab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 1ce876c39f 管理后台测试资源bug修正
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口
chenxiaojun a04f291471 管理后台->删除溪谷入口
zyx 96effb3525 管理后台测试资源bug修正
ELF 6e1a768721 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e4f1ed99f8 修改后台登录页
Your Name 6cb3a9ad75 SDK菜单
Your Name c1a9c3918e SDK菜单
ELF 6df44afb16 功能隐藏
ELF 437909d53a 测试
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序
zyx 7ead67f8cb 快捷图标代码修正
zyx c6da6fb705 首页用户注册充值信息修正
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 2f124bffbb coin_num
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段
zyx 0a9dbe6a78 管理后台菜单bug修复
zyx 2a52aa42ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ba6fc9634b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx c8f101f40c 管理后台添加测试资源
zhengchanglong 6154654a35 SDK登录BUG修复
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
Your Name 22e7866644 SDK菜单添加
Your Name f1b5a2257d SDK用户菜单-修改
Your Name b253d23ae3 SDK用户菜单字段名修改
Your Name 971906dd29 SDK用户菜单
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修正