yinzuomei
|
1afcdd705a
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
sunyuchao
|
0a43f51285
|
Merge branch 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
|
6 years ago |
|
sunyuchao
|
d48434d3a1
|
接口入参设置允许的最大字符数
|
6 years ago |
|
yinzuomei
|
3eb15b78fb
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
zhaoqifeng
|
60ce166a72
|
党员认证bug修改
|
6 years ago |
|
sunyuchao
|
55a067bb63
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
sunyuchao
|
d2e8515895
|
对前端传递参数最大字符数做限定
|
6 years ago |
wxz
|
3b1a4bb067
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
6 years ago |
|
wxz
|
8011789b8d
|
1.调整之后的DataFIlter
|
6 years ago |
|
yinzuomei
|
788c015787
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
wangchao
|
727dbd7eae
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
|
6 years ago |
|
wangchao
|
fddbe0efdd
|
居民创建群组，发送消息，更新消息字段到群组操作表中
|
6 years ago |
|
yinzuomei
|
f1ff7be66b
|
8004错误提示信息：手机号未注册，请联系贵单位管理员，确认其录入手机与您所持手机号相同，添加网格发布服务
|
6 years ago |
|
yinzuomei
|
fc3ee3a26c
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
917fd4e8ae
|
8004错误提示信息：手机号未注册，请联系贵单位管理员，确认其录入手机与您所持手机号相同
|
6 years ago |
|
yinzuomei
|
df14ed0283
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
zxc
|
78ed117bf3
|
网格添加：添加地区编码修改
|
6 years ago |
|
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 |
