105 Commits (cd0ff2ef8affa063ac7bc0079c44799396a0f149)

Author SHA1 Message Date
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
ELF a70c1aee21 Merge branch 'release-1.0.0' into dev 5 years ago
sunke 453c0c3682 链接归属名词修改 5 years ago
yulingwei b868b14273 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
yulingwei 2ed2117b6d 更新 5 years ago
sunke dcf7efad6f 下载链接菜单显示bug 5 years ago
liuweiwen 600ac3fd9e 添加推广员时推广公司必填 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 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
liuweiwen dfa5316ef1 推广员状态默认为待审核 5 years ago
zhengchanglong cc6d095a1c 非管理员数据加密显示 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 fe5ae6a499 搜索的推广员数据权限 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 4bf6352f9d 导出添加数据权限 5 years ago
sunke 60f2c62fe6 下载链接管理后台 5 years ago
liuweiwen b3fcf58932 推广员编辑推广公司 5 years ago
liuweiwen d64d18144a 推广公司录入 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
zhanglingsheng 4915ebc70c 推广员oa关联 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
sunke b64882554a 管理后台增加资质审核检索 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
sunke d2d211737f bug 5 years ago
sunke eac235d498 身份认证后台 5 years ago
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
jbrazz db1ea1370a upt 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
jbrazz 74be3407b1 upt 5 years ago
jbrazz a8125bf377 upt 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zyx 7ead67f8cb 快捷图标代码修正 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 5 years ago
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置 5 years ago
ELF 2ffa024c4c initial 5 years ago