wxz
|
1b3fefb073
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
|
2 years ago |
|
wxz
|
8a060a2f7c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
3a000e56fd
|
特殊人群列表，增加所属组织的经纬度
|
2 years ago |
luyan
|
f5c0502fed
|
修改归档率统计条件
|
2 years ago |
|
luyan
|
8c68941334
|
修改获取orgPath方法
|
2 years ago |
|
luyan
|
584f34cf28
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
20b7a726e2
|
增加归档功能和归档率统计
|
2 years ago |
yinzuomei
|
6c46f1c14d
|
灵山大屏中央区域:楼栋坐标分布/点击网格展示房屋分布点位/获取楼栋详情，未测试
|
2 years ago |
|
yinzuomei
|
e47b9fee7d
|
epmetuser/icresiuser/resi-brief/接口适配灵山。
|
2 years ago |
|
yinzuomei
|
9a1f7d7353
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
9856b451b2
|
LingShanHelpCrowdTypeEnum重点帮扶人员类别枚举
|
2 years ago |
|
luyan
|
27cc4368c9
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
24401318b6
|
修改事件分类统计
|
2 years ago |
|
wxz
|
8465697305
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
2 years ago |
|
wxz
|
c6e9fbfadb
|
修改：部门，组织，网格增加description
|
2 years ago |
|
wxz
|
a33ecc2968
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
54965653da
|
修改：处理流程的顺序，按时间倒叙
|
2 years ago |
|
wxz
|
c0703a2296
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
e73289698b
|
修改事件删除bug;
|
2 years ago |
|
luyan
|
6b404024d4
|
修改事件查询错误；
|
2 years ago |
|
luyan
|
d7ee918a3b
|
修改事件回复Bug，根据ID查询事件错误；
|
2 years ago |
|
luyan
|
d4961c542a
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
06922d5f4e
|
测试事件编辑功能；
|
2 years ago |
|
wxz
|
58c8c9de5b
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
f4e0cf8089
|
-
|
2 years ago |
|
wxz
|
1ff1789b04
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
519af27c7a
|
-
|
2 years ago |
|
wxz
|
fcd722c313
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
f5468cfdc4
|
服务列表增加id返回
|
2 years ago |
|
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 |
