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 |
|
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 |