zhengyongxing
|
69ad354ff7
|
数据权限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
|
96bf040f98
|
导出数据权限
|
5 years ago |
|
liuweiwen
|
4bf6352f9d
|
导出添加数据权限
|
5 years ago |
|
zhengchanglong
|
25a4138842
|
扶持管理字眼改成资源管理
|
5 years ago |
|
zhengchanglong
|
2cb7d9bdfd
|
扶持资源改成测试资源
|
5 years ago |
zhanglingsheng
|
2a5dccdab8
|
游戏充值预下单
|
5 years ago |
|
zhanglingsheng
|
33c3fd1d0d
|
游戏联动查询
|
5 years ago |
|
zhanglingsheng
|
24d47089dd
|
游戏预充值
|
5 years ago |
|
zhengyongxing
|
6dc8366018
|
数据授权修改内容提交
|
5 years ago |
|
zhengyongxing
|
3aa3c3f66b
|
数据授权修改
|
5 years ago |
|
zhengchanglong
|
8a241cceb8
|
修改身份证加密显示方式
|
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 |
|
zhengyongxing
|
4a5a6a90d0
|
Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission
Conflicts:
Data/update.sql
|
5 years ago |
chenzhi
|
ff6c70e380
|
合并cz
|
5 years ago |
|
zhengyongxing
|
d545c22c3b
|
数据管理功能提交
|
5 years ago |
|
liuweiwen
|
166a868543
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
zhengyongxing
|
5df3a59df4
|
扶持发放添加导出功能
|
5 years ago |
|
chenzhi
|
c251867ba6
|
修改用户列表重复搜索区服不存在bug
|
5 years ago |
chenxiaojun
|
7cfa9175da
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
b21ec3859f
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
d6b7bc811d
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
ea07864f98
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
zhengyongxing
|
6fbf14c9fe
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
|
5 years ago |
|
zhengyongxing
|
24dab9158b
|
管理后台bug修改
|
5 years ago |
|
zhanglingsheng
|
812532a52d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3a20c68117
|
游戏充值预下单修改
|
5 years ago |
|
zhengyongxing
|
46538019d4
|
管理后台新开发功能修改
|
5 years ago |
|
zhengchanglong
|
6fa8392766
|
Merge branch 'master_zcl' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
ec0fb0d0b4
|
Merge branch 'master_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
65b5fc4a26
|
隐藏游戏充值列表部分字段
|
5 years ago |
|
liuweiwen
|
e30f2f9601
|
Merge branch 'dev' into dev_lww
# Conflicts:
# Application/Admin/Controller/FileController.class.php
# Application/Admin/Controller/GameController.class.php
# Application/Admin/View/Game/edit.html
# Application/Home/Controller/HomeController.class.php
# Application/Home/View/default/Home/landingPage.html
# Public/Home/css/index2.css
|
5 years ago |
|
zhengchanglong
|
381fa8d633
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
zhengchanglong
|
ed584bfb2f
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
zhengchanglong
|
c32c1780e6
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
zhengyongxing
|
b2d1c27054
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
|
chenzhi
|
1ccbd03a0f
|
超级签新增支付方式
|
5 years ago |
|
zhanglingsheng
|
cf7440e87e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
ad97083c9f
|
行为日志文案
|
5 years ago |
|
chenzhi
|
0c62e80e67
|
优化总览表格高度
|
5 years ago |
|
chenzhi
|
6188102e04
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
zhengyongxing
|
11177b895c
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
liuweiwen
|
188abdcbdd
|
落地页视频置顶判断
|
5 years ago |
|
zhengyongxing
|
7b12780d9c
|
管理后台新开发功能修改
|
5 years ago |
|
zhengyongxing
|
976a697b24
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
3d672db381
|
推广补链新增一系列查询条件
|
5 years ago |
 ELF
|
c451921b92
|
后台添加IOS打包方式选择
|
5 years ago |
|
liuweiwen
|
cdeea23034
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
14644b44a2
|
落地页图片改为使用游戏截图
|
5 years ago |
|
zhanglingsheng
|
f392ad4de0
|
游戏充值行为日志
|
5 years ago |