Commit Graph

4432 Commits (25954045e95907f02f5831661d0573a068bf3322)
 

Author SHA1 Message Date
ELF f6eb5d8008 修改bug
chenxiaojun 258e10c9d1 结算管理--更新
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化
liuweiwen ef975943bb 针对admin的后台账号对游戏充值和角色查询做完全访问权限,没完全访问权限时必须通过搜索才显示结果
sunke 4793665896 充值信息根据会长权限显示导出部分
zhengyongxing 136f565f9f 市场结算管理设备类型条件修正
ELF c4b768879e Merge branch 'feature/site_sms' into dev
chenxiaojun 4f63f45374 推广平台>数据管理>每日概况|数据汇总--更新
yulingwei 569fc37e40 Merge branch 'feature/promote_perm' of 47.111.118.107:wmtx/platform into feature/promote_perm
yulingwei 23f2334e45 新增充值权限查看
ELF 7a1cd5bc94 添加完整的权限判断
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
ELF f0acbc1c24 充值信息根据会长权限显示
chenxiaojun 2e1742c759 推广提现--更新
sunke 9152a3ef59 推广配置导入功能
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
liuweiwen cdfa8e4eee admin权限
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 21806993d4 admin权限
chenzhi 5fdb7946cc 新增登陆记录列表统计权限
chenzhi 07e4fb2e56 优化列表和统计权限函数
ELF e4daff1be8 修改短信接口
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
chenzhi 4e1567f013 新增玩家列表列表及统计权限
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化
zhengyongxing 3559d91a32 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release
liuweiwen 5a633ccb49 工会归属申请时间日期格式化
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化
zhengyongxing f4b6fa4738 用户信息小号隐藏
zhengyongxing 076daf0d4e query冲突解决
zhengyongxing 14ce9c02fa Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Application/Admin/Controller/MemberController.class.php
zhengyongxing 0349d5c5aa 用户信息小号隐藏
ELF 3ab162ae65 修改sql
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release
liuweiwen 2b3099a2d8 工会归属会长不可编辑
ELF b38eed342f Merge branch 'release' into dev
ELF c6d99af7a1 Merge branch 'hotfix/shift_player_selle' into release
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF f27728b9dd Merge branch 'hotfix/change_btn_color' into release
ELF f7a53c7562 Merge branch 'feature/account_safe' into release
ELF c4934613ae 解决冲突
廖金灵 9933682cc3 Merge branch 'release-1.0.1' of wmtx/platform into release
功能上预发布