yinzuomei
|
04649ee217
|
编辑人员bug修改，添加网格，地区编码bug修改
|
6 years ago |
|
yinzuomei
|
7bba82cf2b
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
yinzuomei
|
012a50a859
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
|
6 years ago |
zhaoqifeng
|
cfdf7d7696
|
组织-工作人员编辑 bug修改
|
6 years ago |
zxc
|
a8c4f77272
|
网格添加：添加地区编码
已认证党员详情：添加address字段
|
6 years ago |
|
yinzuomei
|
7b2103111d
|
待审核党员列表接口修改
|
6 years ago |
|
yinzuomei
|
b9c793aabb
|
gov org删除网格bug修复
|
6 years ago |
|
yinzuomei
|
73183f01e7
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
zxc
|
5a1191aecf
|
网格删除
|
6 years ago |
|
yinzuomei
|
bc3f757afa
|
删除网格bug修复
|
6 years ago |
|
yinzuomei
|
7f03c41c9a
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
zxc
|
4c91dd51aa
|
网格删除
|
6 years ago |
|
yinzuomei
|
9155d4e9c1
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
zxc
|
f92db0e586
|
网格详情roleName修改
|
6 years ago |
|
yinzuomei
|
cbddbbe82c
|
user、govorg发布
|
6 years ago |
|
yinzuomei
|
313645bb4b
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
yinzuomei
|
ced4f92c21
|
人员编辑详情fullTimeOnly接口修改
|
6 years ago |
|
zxc
|
70a0dfb8e9
|
网格详情roleName修改
|
6 years ago |
|
zxc
|
84fcc65aa3
|
网格详情roleName修改
|
6 years ago |
|
yinzuomei
|
343f09d490
|
govorg发布
|
6 years ago |
|
yinzuomei
|
2d791faa4c
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
yinzuomei
|
125f90132b
|
Merge branches 'dev' and 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
|
6 years ago |
|
yinzuomei
|
39bcba0e08
|
epmet-user0.3.12发布
|
6 years ago |
|
yinzuomei
|
ed206734cf
|
Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
sunyuchao
|
5f79cc88f9
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
sunyuchao
|
31cf5820f9
|
Bug修改
|
6 years ago |
|
zxc
|
d9e4bff1f8
|
添加部门人员
|
6 years ago |
|
yinzuomei
|
436277fe39
|
gov-org,epmet-user,发布
|
6 years ago |
|
yinzuomei
|
083c491201
|
gov-org,epmet-user,resi-partymember发布
|
6 years ago |
|
yinzuomei
|
163e01903e
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
5fd2edeaa9
|
Merge branches 'dev' and 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
|
6 years ago |
|
yinzuomei
|
263e92f203
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
yinzuomei
|
9ce29f508d
|
listStaffIdsByRoleKeyAndOrgId sql修改
|
6 years ago |
|
zhaoqifeng
|
834f049504
|
党员认证bug修改
|
6 years ago |
wangchao
|
3c9867c57a
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wangchao
|
4ddb3bb61b
|
CustomerStaff
|
6 years ago |
|
yinzuomei
|
7fbcc358e1
|
gov-mine0.3.4切换网格校验bug修改
|
6 years ago |
|
yinzuomei
|
e8e7f7fb61
|
user0.3.9,govaccess0.3.3govorg0.3.12
|
6 years ago |
|
yinzuomei
|
35f5e42e90
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
7e3b2b5e71
|
切换网格修改
|
6 years ago |
wxz
|
9bbc18a109
|
1.修复：部分sql语句没有加del_flag=0的条件
|
6 years ago |
|
sunyuchao
|
a8eae6338e
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
sunyuchao
|
32d8f9ee84
|
查询部门下人员角色改用组织Id,不能用部门Id
|
6 years ago |
|
zhaoqifeng
|
3b8e986e2e
|
管理员无法禁用自己
|
6 years ago |
|
yinzuomei
|
f12cb631f6
|
gov-org0.3.11发布，解决一出部门工作人员接口404
|
6 years ago |
|
wangchao
|
f3281318fa
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wangchao
|
0dab318327
|
移除部门工作人员接口添加requestMapping
|
6 years ago |
|
yinzuomei
|
4d9ec91077
|
user、govgrid、govorg、resipartymember发布
|
6 years ago |
|
yinzuomei
|
658096023b
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yinzuomei
|
c099a45914
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
|
6 years ago |
