Commit Graph

21 Commits (88c70c29db3d5caeae27fd7382c3892c894887e1)

Author SHA1 Message Date
zhengyongxing 001e9e70f8 管理后台导出权限添加
liuweiwen ad48df6c91 数据展示权限
liuweiwen a1c3ad8fb3 数据展示权限
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
zhengyongxing d465be8969 数据权限提交
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
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
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev
zhanglingsheng 2a5dccdab8 游戏充值预下单
zhanglingsheng 33c3fd1d0d 游戏联动查询
zhanglingsheng 31af192402 解决冲突
zhanglingsheng 8f75d0f450 游戏
zhanglingsheng 24d47089dd 游戏预充值
zhanglingsheng 0e0f603d13 游戏充值预下单
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng 3a20c68117 游戏充值预下单修改
zhanglingsheng ad97083c9f 行为日志文案
zhanglingsheng f392ad4de0 游戏充值行为日志