wxz
|
4f23043d56
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
yinzuomei
|
e037148819
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
09fc9988fb
|
保存了内容，还没发消息
|
3 years ago |
|
yinzuomei
|
0fd79ffcb6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
208d516403
|
工作人员缓存增加pid,orgIdPath
|
3 years ago |
|
yinzuomei
|
0b71ba8f79
|
消息管理未完待续.
|
3 years ago |
|
wxz
|
88c600fbd1
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
|
3 years ago |
|
wxz
|
033e59dc07
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
wxz
|
4f442eff01
|
1.修改：新增工作人员addstaffv2接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储
2.修改：编辑工作人员editstaff接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储
|
3 years ago |
|
wxz
|
7e37e6e9f9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
wxz
|
f16974a20f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wxz
|
1b7c69afc2
|
修改身份证正则解析工具类，增加出生日期[LocalDate类型]的返回
|
3 years ago |
|
yinzuomei
|
64976a43fa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
3 years ago |
|
yinzuomei
|
5b69b9843e
|
/resi/partymember/icPartyOrg/editPrincipal接口principalStaffId不必填；
|
3 years ago |
|
wxz
|
46b63638e8
|
【小组】大屏查询小组
|
3 years ago |
|
wxz
|
1f0cb8d472
|
Merge branch 'master' into lingshan_master
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
3 years ago |
|
wxz
|
a6db5f9810
|
【小组】创建小组-增加orgIdpath,agencyId
|
3 years ago |
|
wxz
|
3776c6fe21
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wxz
|
e53a097f99
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
yinzuomei
|
2e1dfe9277
|
居民信息列表查询排序调整
|
3 years ago |
|
yinzuomei
|
6d9964e3a4
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
494b9881f1
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
wxz
|
638afa239e
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
c0f81da07f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
wxz
|
67396a3ad1
|
特殊人群：增加查询各类人员分布了
|
3 years ago |
|
yinzuomei
|
e76e075c9c
|
市北反馈社区安全服务列表查询不出来
|
3 years ago |
|
wxz
|
a9c59473ed
|
特殊人群：增加柱状图和各类人员数量。下一步要查询各类人员分布了
|
3 years ago |
|
yinzuomei
|
83132ff534
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
abfa7fd337
|
部门导入组织编码文本格式
|
3 years ago |
|
yinzuomei
|
7e162798bc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
d12a227095
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
d2bf511503
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
73d65e2eb9
|
同一组织下，部门名称唯一
|
3 years ago |
|
yinzuomei
|
6e2c8919f5
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
7d21bf38ec
|
同一组织下，部门名称唯一
|
3 years ago |
|
yinzuomei
|
65c5a18edc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
0e9c256fd0
|
部门职责默认为空字符串
|
3 years ago |
|
yinzuomei
|
36a3124b6f
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
2e68db40a9
|
部门导入，微测试
|
3 years ago |
|
yinzuomei
|
650bea6c69
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
19f0c74add
|
部门导入，微测试
|
3 years ago |
|
yinzuomei
|
07aff3c6fc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
343745bd0a
|
信息采集导出文件名
|
3 years ago |
|
yinzuomei
|
4dadc8c334
|
信息采集详情列表根据户主、状态查询
|
3 years ago |
|
yinzuomei
|
dc8d20f7de
|
信息采集详情返回与户主关系名称
|
3 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
|
3 years ago |
|
yinzuomei
|
f8b5bad49c
|
办事指南发布，pids值错误；
|
3 years ago |
|
yinzuomei
|
b83cb8ad35
|
办事指南发布，pids值错误
|
3 years ago |
|
yinzuomei
|
a7fdde788d
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
da489b7150
|
信息采集审核调整，微测试
|
3 years ago |
