wxz
|
a55ab6f58b
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
ca0a27d36c
|
【灵山-代办服务】调整pc端列表接口必填项。撤回，驳回等，都给processTime赋值
|
2 years ago |
|
wxz
|
f8337eedd0
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
2 years ago |
|
wxz
|
c052c7d392
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
d7fe8bedc2
|
【灵山-党建引领】1.新增：大屏中间，各党相关对象的数量统计。2：新增：党组织逐级点入，根据行政组织id查询下级党相关对象的名称，坐标，党员数量
|
2 years ago |
lichao
|
a5418a6368
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
lichao
|
0ce47b432e
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
cf2d8be960
|
楼洞详情
|
2 years ago |
yinzuomei
|
3e96fbf248
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
d304ee853c
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
aecd032441
|
修改楼洞详情
|
2 years ago |
|
yinzuomei
|
c403082292
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
3b6c6202e1
|
物业列表按照管理小区数量降序
|
2 years ago |
|
lichao
|
770d2d6e52
|
楼洞修改
|
2 years ago |
|
lichao
|
4c6c68ee89
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
f2786fcdb7
|
导入小区物业关联
|
2 years ago |
|
lichao
|
7f21071bcc
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
a9af7fa940
|
excel调整
|
2 years ago |
|
lichao
|
0c0d7f2f8b
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
81c12e037d
|
错误信息修改
|
2 years ago |
|
yinzuomei
|
fd70053de1
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
17b309f8cb
|
楼张单元长导入模板调整。
|
2 years ago |
|
wxz
|
7d5ced1803
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
3e620919d8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
yinzuomei
|
7055e06cab
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
yinzuomei
|
e293629070
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
wxz
|
ebd9d12f9a
|
【红色代办】1.修改：服务分类列表接口增加图标地址
|
2 years ago |
|
lichao
|
bd551f84af
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
71dc1fa73d
|
客户导入
|
2 years ago |
|
yinzuomei
|
d3f281a321
|
死亡数据同步逻辑调整:居民信息不存在
|
2 years ago |
|
yinzuomei
|
d873128a32
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
947072e704
|
死亡数据同步逻辑调整
|
2 years ago |
|
wxz
|
315e2dea35
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
9825bcc1c5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
1bddac93de
|
【红色代办】1.新增：服务分类列表接口
|
2 years ago |
|
yinzuomei
|
a3eee1dcf0
|
/epmetuser/dataSyncRecordDeath/page
|
2 years ago |
|
yinzuomei
|
a9c54b876c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
yinzuomei
|
a20b5dc632
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
wxz
|
e528c52e40
|
【红色代办】各种列表：增加附件返回
|
2 years ago |
|
lichao
|
2f2e880929
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
eb596f771a
|
客户导入
|
2 years ago |
|
yinzuomei
|
d5f77e748b
|
居民信息列表，展示证件类型
|
2 years ago |
|
yinzuomei
|
fca14ac120
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
eb61e0be0b
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
e0c293d215
|
居民信息查询条件，列表调整
|
2 years ago |
|
lichao
|
c8e3169465
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
41fe49d895
|
楼洞导入
|
2 years ago |
|
lichao
|
c4a0cb8ef9
|
customerId新增注解
|
2 years ago |
|
lichao
|
8bf1f554c5
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
wxz
|
c7824bbe8c
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
