83 Commits (747bba16b0119c99f4ab06c4f7d4346bf075edce)

Author SHA1 Message Date
yulingwei dfe52865bd upt 5 years ago
yulingwei 2cd5574de7 新增审核时间 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
jbRotk 65461ff200 c 5 years ago
liuweiwen 0fba64c6f1 数据展示权限:勾选权限时,*号屏蔽的地方要开放,另没数据权限的地方补上 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
zhengchanglong 9961448831 Merge branch 'release' into dev 5 years ago
liuweiwen 490b6a3369 工会归属隐藏导出 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
chenxiaojun 5a75ea406a 更新 5 years ago
liuweiwen ccca9fb0bd 管理后台-》推广员列表可关键内外团搜索 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
zhengchanglong d054e70c73 Merge branch 'release' into dev
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
5 years ago
liuweiwen 5a633ccb49 工会归属申请时间日期格式化 5 years ago
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release 5 years ago
liuweiwen 2b3099a2d8 工会归属会长不可编辑 5 years ago
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
liuweiwen 7431072bbf 从dev复制代码 5 years ago
liuweiwen af28ff9155 工会归属查询 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
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