358 Commits (32e362ab806ed404ba98d7308636bc233f58c526)

Author SHA1 Message Date
liuweiwen 8a512aedc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen ab27c53da4 修改提示 5 years ago
zhengyongxing a7e747e639 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing ac6f980d03 角色权限返回样式调整 5 years ago
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong 42542ff640 非管理员数据加密显示 5 years ago
liuweiwen eb6c65522d 修改提示 5 years ago
zhengyongxing 17e4084192 角色权限返回调整 5 years ago
liuweiwen cc1e3ccbb3 推广员账号已存在判断 5 years ago
liuweiwen dfa5316ef1 推广员状态默认为待审核 5 years ago
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
5 years ago
zhengchanglong 1ca183b547 非管理员数据加密显示 5 years ago
zhengchanglong c6b8f99b6e 非管理员数据加密显示 5 years ago
zhengchanglong 9a2a7df2e6 非管理员数据加密显示 5 years ago
zhengchanglong cc6d095a1c 非管理员数据加密显示 5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
liuweiwen e32491c108 bug修复,解决点击搜索框后下拉显示异常 5 years ago
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮 5 years ago
liuweiwen 546a7029cd bug修复:游戏充值-》补单没权限提示内容为空的问题 5 years ago
liuweiwen 69e3843a56 修改文字 5 years ago
zhengyongxing d465be8969 数据权限提交 5 years ago
chenzhi c6f2794a3b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi f480cd6b7a 优化给推广员发放平台币时菜单问题 5 years ago
liuweiwen 21e90e6cb3 Merge branch 'dev_permission' into release-1.0.0 5 years ago
liuweiwen fe5ae6a499 搜索的推广员数据权限 5 years ago
zhengyongxing 153f731b55 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing e8c3f021b6 角色查询导出修改 5 years ago
liuweiwen 4fca3e8288 修改返回按钮样式 5 years ago
liuweiwen 511b780f72 返回跳转 5 years ago
liuweiwen ee2fc154a4 推广公司 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 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