wxz
|
57e2b56607
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
ebd58115f6
|
modify
|
2 years ago |
|
wxz
|
e6b9cd5fb9
|
Merge branch 'master' into lingshan_master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java
|
2 years ago |
|
wxz
|
9f35c48683
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
|
2 years ago |
|
wxz
|
a772b088da
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
0e18844166
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
79bf2c6ce1
|
新增：【灵山街道】大屏，代办服务详情（处理进展）
|
2 years ago |
yinzuomei
|
72bb63e0ba
|
房屋管理-房屋列表、查看详情、社区查询（房屋）统一返回partyCenterHouseFlag
|
2 years ago |
|
yinzuomei
|
809c58f845
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
05f37c85ce
|
绑定联户调整。党员信息导入调整
|
2 years ago |
|
yinzuomei
|
5652b0a806
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
c527311c6d
|
忘了赋值
|
2 years ago |
|
yinzuomei
|
ab92424f90
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
73c5879752
|
更新房屋是否党员中心户，加个房屋变更记录
|
2 years ago |
lichao
|
4a1e3ccdc3
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
yinzuomei
|
60f0004ed4
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
b90add68e6
|
test
|
2 years ago |
|
lichao
|
511eaab4ee
|
死亡拉取
|
2 years ago |
|
wxz
|
7ea467d5ef
|
modify...
|
2 years ago |
|
wxz
|
1c017f729b
|
Merge branch 'master' into dev
|
2 years ago |
|
wxz
|
2ca1202040
|
Merge branch 'master' into lingshan_master
|
2 years ago |
|
wxz
|
effcb40ce6
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
wxz
|
465222149b
|
增加一个居民信息导入的postProcessor
|
2 years ago |
|
yinzuomei
|
c12acd6c14
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
2 years ago |
|
yinzuomei
|
ba94f0b41d
|
等会再改
|
2 years ago |
|
yinzuomei
|
d9a8ce711a
|
等会再改
|
2 years ago |
|
yinzuomei
|
662d68a165
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
2 years ago |
|
yinzuomei
|
547f9da83d
|
新增，编辑，删除居民，更新房屋是否是党员中心户
|
2 years ago |
|
yinzuomei
|
fdf9a82f62
|
去掉一个GovOrgOpenFeignClient
|
2 years ago |
|
yinzuomei
|
cc18fc8dc8
|
直接在dev改
|
2 years ago |
luyan
|
3164b2bee6
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
f804020c6d
|
增加事件回复表单参数；
|
2 years ago |
|
yinzuomei
|
cb1d4fb2dd
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
f664a2eb10
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
aebfdf7239
|
修改事件，增加处理流程表单参数
|
2 years ago |
|
luyan
|
ab8c6f89e2
|
优化依赖关系
|
2 years ago |
|
yinzuomei
|
d43275feaf
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
b0d9d88526
|
常量参数
|
2 years ago |
|
luyan
|
9ec541a4f7
|
移除钉钉
|
2 years ago |
|
yinzuomei
|
008a2aae1e
|
baseDao.selectListPartyCenterHouse(
|
2 years ago |
|
luyan
|
b9d9fdbee7
|
移除钉钉
|
2 years ago |
|
luyan
|
bffd011bb3
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
b0b9e9e350
|
移除新增事件管理
|
2 years ago |
|
yinzuomei
|
3eb3ef92ca
|
合并冲突
|
2 years ago |
|
yinzuomei
|
b5d347347f
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
|
2 years ago |
|
yinzuomei
|
fe5d764f26
|
queryLianHuHouse
|
2 years ago |
|
yinzuomei
|
eda679a8d9
|
绑定联户入参调整
|
2 years ago |
|
yinzuomei
|
3ab1782fa5
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
f9481afd6b
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
543acebce2
|
partyCenterHouseFlag
|
2 years ago |
