830 Commits (e7b2f57a9363bde7981a6246576c73862ba9604c)

Author SHA1 Message Date
zhengyongxing e7b2f57a93 数据权限bug修正 5 years ago
zhengyongxing ce0e9f943d 数据权限bug修正 5 years ago
zhengyongxing 3151e8b456 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing ce58d63aa5 充值汇总bug修正 5 years ago
zhanglingsheng 7f9ec687cb 行为日志显示bug 5 years ago
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 0695a22472 导出数据权限 5 years ago
liuweiwen 96bf040f98 导出数据权限 5 years ago
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天 5 years ago
liuweiwen 62f5098df7 处理数据权限筛选时,不覆盖原有的搜索字段promote_id 5 years ago
liuweiwen a9a6b49148 空格 5 years ago
zhanglingsheng df4f7fc511 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 375bbac885 行为日志 5 years ago
liuweiwen 4bf6352f9d 导出添加数据权限 5 years ago
liuweiwen 31790a7e51 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 5 years ago
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
5 years ago
zhengyongxing 48437d25c2 数据权限导出修改 5 years ago
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
5 years ago
zhengchanglong 25a4138842 扶持管理字眼改成资源管理 5 years ago
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
chenzhi da79ff4441 优化角色权限2 5 years ago
zhengyongxing deaeed6027 数据授权修改内容提交 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhanglingsheng a15e62988b 游戏预充值-导出 5 years ago
chenzhi 1623f3ae65 优化多会长统计1 5 years ago
zhanglingsheng eaf1cb3f17 游戏区服联动修改 5 years ago
liuweiwen 6b1bbe4c20 数据授权修改 5 years ago
zhanglingsheng 47628f2981 游戏充值预下单 5 years ago
zhanglingsheng fb425d3e91 游戏充值预下单 5 years ago
zhengyongxing 21412df14e Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
zhengyongxing 3aa3c3f66b 数据授权修改 5 years ago
zhanglingsheng e949a4a60b 游戏充值预下单 5 years ago
zhanglingsheng 95f7acd6ff 游戏充值预下单 5 years ago
zhanglingsheng 65e1ddbd93 游戏充值预下单 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong f88a5c7f6e Merge branch 'dev' into release-1.0.0 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
5 years ago
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 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 2b336dd560 数据文件删除 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
liuweiwen 1212d3249e 添加数据权限
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
5 years ago
chenzhi ff6c70e380 合并cz 5 years ago