46 Commits (d7bd8326bd3c1a4608378dd8d19083e8f568f8b6)

Author SHA1 Message Date
zhengyongxing d465be8969 数据权限提交 5 years ago
liuweiwen fe5ae6a499 搜索的推广员数据权限 5 years ago
zhengyongxing ce0e9f943d 数据权限bug修正 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 62f5098df7 处理数据权限筛选时,不覆盖原有的搜索字段promote_id 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
5 years ago
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id 5 years ago
zhengchanglong 6851933966 新建分支 5 years ago
chenzhi db6131a135 暂存 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi af593e4326 优化首页折线统计统计方式 5 years ago
yulingwei 2ab47c0864 充值方式修改 5 years ago
yulingwei be33c5c471 更新 5 years ago
chenzhi b52113622d [bug]无法获取上线推广员问题 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhanglingsheng a514e5b5dc 支付方式添加快捷 5 years ago
zhanglingsheng e07e1ff2aa 支付方式添加快捷 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
jbrazz a8125bf377 upt 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
zhengchanglong 5c8573df37 修改月份列表 5 years ago
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 112316c395 财务管理功能添加 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
ELF 2ffa024c4c initial 5 years ago