123 Commits (9cb0e335313c4541913248d62040a93ddf16a7b0)

Author SHA1 Message Date
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
4 years ago
zhengyongxing b664ba46ad 汇总单代码提交 4 years ago
zhengyongxing 9d43914b17 汇总单结算代码上传 4 years ago
yulingwei 6ada5711ab upt 5 years ago
chenzhi 2cf0fdf905 新增公会归属编辑规则修改 5 years ago
chenzhi ec4d180287 优化公会更改 5 years ago
chenzhi 09e71420e0 优化推广员归属审核 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
5 years ago
chenzhi d6e44d32dc 优化推广员申请游戏名称及选择样式 5 years ago
chenzhi 121fc02f18 推广员内外团归属优化2 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi d7662eb305 推广员现在归属于公司团体 5 years ago
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择 5 years ago
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
5 years ago
chenzhi c61f750549 优化新增推广员员时手机号错误问题 5 years ago
chenzhi 26300062b1 推广员-数据管理-实时充值 优化打开速度 5 years ago
zhengyongxing 958fb41227 管理后台日志唯一键值修改 5 years ago
zhengyongxing ab6e063c9a 推广员管理管理日志添加 5 years ago
liuweiwen 4cb88be352 数据权限 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei dfe52865bd upt 5 years ago
yulingwei 3c44d5d200 upt 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
chenxiaojun b7d2931106 管理后台--更新 5 years ago
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
xxxx a85c217c6b OA管理员绑定 5 years ago
jbRotk 65461ff200 c 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
yulingwei 22addc182c 修改检索问题 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
chenxiaojun 5a75ea406a 更新 5 years ago
liuweiwen 38c64f5430 管理后台-》推广员列表可关键内外团搜索 5 years ago
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
liuweiwen cdfa8e4eee admin权限 5 years ago
liuweiwen 21806993d4 admin权限 5 years ago
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
liuweiwen 08f8c518a6 从dev复制代码 5 years ago
liuweiwen 7431072bbf 从dev复制代码 5 years ago
liuweiwen af28ff9155 工会归属查询 5 years ago
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 51844a824e 工会归属会长必填 5 years ago