wxz
|
c0f81da07f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
yinzuomei
|
83132ff534
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
abfa7fd337
|
部门导入组织编码文本格式
|
2 years ago |
|
yinzuomei
|
7e162798bc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
d12a227095
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
d2bf511503
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
73d65e2eb9
|
同一组织下，部门名称唯一
|
2 years ago |
|
yinzuomei
|
6e2c8919f5
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
7d21bf38ec
|
同一组织下，部门名称唯一
|
2 years ago |
|
yinzuomei
|
65c5a18edc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
0e9c256fd0
|
部门职责默认为空字符串
|
2 years ago |
|
yinzuomei
|
36a3124b6f
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
2e68db40a9
|
部门导入，微测试
|
2 years ago |
|
yinzuomei
|
650bea6c69
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
19f0c74add
|
部门导入，微测试
|
2 years ago |
|
yinzuomei
|
07aff3c6fc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
2 years ago |
|
yinzuomei
|
343745bd0a
|
信息采集导出文件名
|
2 years ago |
|
yinzuomei
|
4dadc8c334
|
信息采集详情列表根据户主、状态查询
|
2 years ago |
|
yinzuomei
|
dc8d20f7de
|
信息采集详情返回与户主关系名称
|
2 years ago |
|
yinzuomei
|
289f95387f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml
|
2 years ago |
|
yinzuomei
|
f8b5bad49c
|
办事指南发布，pids值错误；
|
2 years ago |
|
yinzuomei
|
b83cb8ad35
|
办事指南发布，pids值错误
|
2 years ago |
|
yinzuomei
|
a7fdde788d
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj
|
2 years ago |
|
yinzuomei
|
da489b7150
|
信息采集审核调整，微测试
|
2 years ago |
|
wxz
|
f18bb7b8ca
|
微调居民信息变更记录中的customerId，staffId的获取方式
|
2 years ago |
|
wxz
|
6be81b4f59
|
增加私有化部署的一点文档
|
2 years ago |
|
wxz
|
7f2f8f781c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
d999ffbe2e
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
e84fd03b6f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
08369aff3d
|
1.文章栏目，增加tree接口
2.增加通过父id查询子栏目列表的接口
|
2 years ago |
|
wxz
|
0ab768080b
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
yinzuomei
|
de5dc99ba7
|
fix
|
2 years ago |
|
yinzuomei
|
1fa5c9ecf7
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
633d391585
|
fix
|
2 years ago |
|
yinzuomei
|
1d3e661ef1
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
6332e357bc
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
b7e03649ad
|
fix
|
2 years ago |
|
wxz
|
49ed67321a
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
34c319c035
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
f5c05456da
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
927b4e5fd4
|
1.fix:特殊人群导入模板有问题
2.特殊人群新增，增加居民头像字段
3.特殊人群详情增加居民头像返回
4.特殊人群保存和详情的返回日期格式修改
|
2 years ago |
|
yinzuomei
|
9329e013a7
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
de31cf49e5
|
updateArticle
|
2 years ago |
|
yinzuomei
|
068e6e35d9
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
97c11ef229
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
200527744c
|
updateArticle
|
2 years ago |
|
wxz
|
d513516d5c
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
b8136cbb6f
|
fix
|
2 years ago |
|
wxz
|
8a10311285
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
7d1272c54e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
