Commit Graph

66 Commits (d792e3434886c328fb9f5964d9e757c49c36afbb)

Author SHA1 Message Date
chenxiaojun 4721e60d32 推广员资质认证
chenxiaojun 0ff9f77181 推广员资质认证
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
liuweiwen 0b3ae062b1 优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
chenxiaojun 0baf97f717 会长提现--更新
elf@home 6e354fe3b3 优化链接归属查询
liuweiwen c44e5ee1a7 编辑推广员时,只允许会长修改推广公司,同时更改底下推广员的公司
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填
liuweiwen 78e1fefbc7 推广员账号判断
liuweiwen 600ac3fd9e 添加推广员时推广公司必填
sunke ec1cb552d0 落地页管理检索初始化
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
liuweiwen cc1e3ccbb3 推广员账号已存在判断
liuweiwen 2096c22826 注释
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
zhengchanglong dbaf93b630 非管理员数据加密显示
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮
liuweiwen b8e5d719d5 修复bug:推广员-》数据管理-》实时充值,解决昨日充值与今日充值筛选时间未生效的问题
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的
liuweiwen ee98ca39bb 推广公司
liuweiwen ee2fc154a4 推广公司
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
liuweiwen 96bf040f98 导出数据权限
liuweiwen a9a6b49148 空格
sunke 60f2c62fe6 下载链接管理后台
liuweiwen 6b1bbe4c20 数据授权修改
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
zhengyongxing 46538019d4 管理后台新开发功能修改
zhanglingsheng 728f78db09 OA关联切换正式
chenzhi dfff8b6240 优化推广员选择
zhanglingsheng 864e2e5de1 OA
zhanglingsheng 473fd31be1 OA
zhanglingsheng 86f05872d2 OA
zhanglingsheng a900e5ed66 OA关联
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取
zhanglingsheng de3f6196e6 oa关联
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ce21545360 oa-关联
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei bcc0b964b0 upt
zhanglingsheng e9e66fa8a0 oa关联
zhanglingsheng 0a9efe02ca oa关联
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4590988f95 oa
yulingwei b9bc2a7162 更新
zhanglingsheng 668e4d097c 推广员oa关联
zhanglingsheng 4915ebc70c 推广员oa关联
zhanglingsheng dcd9791f79 推广员oa关联