133 Commits (afad195062d4a4d0afa423ba2bb40d3750ee6a6c)

Author SHA1 Message Date
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
liuweiwen 64cdea78a3 工会归属管理 5 years ago
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun d995675829 更新 5 years ago
chenxiaojun 1594500eca 资质认证--更新 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
chenzhi 377bdaee72 合并gt 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
chenxiaojun 4721e60d32 推广员资质认证 5 years ago
chenxiaojun 0ff9f77181 推广员资质认证 5 years ago
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev 5 years ago
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
5 years ago
liuweiwen 0b3ae062b1 优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
5 years ago
chenxiaojun 0baf97f717 会长提现--更新 5 years ago
elf@home 6e354fe3b3 优化链接归属查询 5 years ago
liuweiwen c44e5ee1a7 编辑推广员时,只允许会长修改推广公司,同时更改底下推广员的公司 5 years ago
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填 5 years ago
liuweiwen 78e1fefbc7 推广员账号判断 5 years ago
liuweiwen 600ac3fd9e 添加推广员时推广公司必填 5 years ago
sunke ec1cb552d0 落地页管理检索初始化 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen cc1e3ccbb3 推广员账号已存在判断 5 years ago
liuweiwen 2096c22826 注释 5 years ago
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮 5 years ago
liuweiwen b8e5d719d5 修复bug:推广员-》数据管理-》实时充值,解决昨日充值与今日充值筛选时间未生效的问题 5 years ago
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的 5 years ago
liuweiwen ee98ca39bb 推广公司 5 years ago
liuweiwen ee2fc154a4 推广公司 5 years ago
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen 96bf040f98 导出数据权限 5 years ago
liuweiwen a9a6b49148 空格 5 years ago
sunke 60f2c62fe6 下载链接管理后台 5 years ago
liuweiwen 6b1bbe4c20 数据授权修改 5 years ago
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
zhanglingsheng 728f78db09 OA关联切换正式 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
zhanglingsheng 864e2e5de1 OA 5 years ago
zhanglingsheng 473fd31be1 OA 5 years ago
zhanglingsheng 86f05872d2 OA 5 years ago
zhanglingsheng a900e5ed66 OA关联 5 years ago
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取 5 years ago
zhanglingsheng de3f6196e6 oa关联 5 years ago
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ce21545360 oa-关联 5 years ago
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei bcc0b964b0 upt 5 years ago
zhanglingsheng e9e66fa8a0 oa关联 5 years ago
zhanglingsheng 0a9efe02ca oa关联 5 years ago
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4590988f95 oa 5 years ago
yulingwei b9bc2a7162 更新 5 years ago
zhanglingsheng 668e4d097c 推广员oa关联 5 years ago
zhanglingsheng 4915ebc70c 推广员oa关联 5 years ago
zhanglingsheng dcd9791f79 推广员oa关联 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei a7f6d8b7a4 upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
jbrazz 2dd1372b78 upt 5 years ago
ELF 7547e867bb 三级变四级修改 5 years ago
jbrazz a8125bf377 upt 5 years ago
ELF 5b62b99765 三级变四级 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 5 years ago
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置 5 years ago
ELF 2ffa024c4c initial 5 years ago