369 Commits (ec273ab157cd8c56e3df52fe315d4f36dd620037)

Author SHA1 Message Date
chenxiaojun ec273ab157 公会分成管理--更新 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
5 years ago
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
5 years ago
liuweiwen 96bf040f98 导出数据权限 5 years ago
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen 4bf6352f9d 导出添加数据权限 5 years ago
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 46c7c85b68 超级签详情样式 5 years ago
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 63d945b4df 修改样式 5 years ago
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei bc7c6b493c 修复问题 5 years ago
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 36b295919a 修复问题 5 years ago
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复 5 years ago
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj 5 years ago
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhanglingsheng 83ce328062 超级订单搜索导出 5 years ago
zhanglingsheng c112391dea 超级订单搜索导出 5 years ago
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng cbbbf6350c 超级签统计--导出 5 years ago
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng b3a98a5f29 超级签统计 5 years ago
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 09ba38fc79 超级签统计 5 years ago
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev 5 years ago
zhengchanglong 25a4138842 扶持管理字眼改成资源管理 5 years ago
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev 5 years ago
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
yulingwei 9f156f7be4 ltv优化 5 years ago
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源 5 years ago
chenxiaojun 8fd8ae006a 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 5040b78473 登录日志修改 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 31af192402 解决冲突 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago