yinzuomei
|
50e66a20bd
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.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/impl/HouseServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
|
3 years ago |
|
yinzuomei
|
8888215fd8
|
联户群众列表
|
3 years ago |
|
yinzuomei
|
cd8f0f573d
|
大屏房屋列表。点击房屋查询联户坐标点位
|
3 years ago |
|
yinzuomei
|
465e4bb782
|
删除
|
3 years ago |
|
yinzuomei
|
c6deed961e
|
提上去
|
3 years ago |
|
yinzuomei
|
9c3b219be8
|
没有用到
|
3 years ago |
|
yinzuomei
|
aa5a85b9b1
|
houseDetail/{houseId}大屏房屋详情
|
3 years ago |
|
yinzuomei
|
249f976989
|
/epmetuser/icresiuser/ownerrelation调整适配灵山需求
|
3 years ago |
luyan
|
d4b7b40f9b
|
增加按事件来源分类统计占比
|
3 years ago |
|
yinzuomei
|
da8bcf10ca
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
yinzuomei
|
4d146ae663
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
yinzuomei
|
af2936cfc1
|
/epmetuser/icresiuser/ownerrelation调整适配灵山需求
|
3 years ago |
|
luyan
|
65b0a17f42
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
44376159eb
|
增加按事件来源分类统计占比
|
3 years ago |
wxz
|
538526a928
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
a9b14fd3af
|
fix:【灵山-特殊人群】大屏：特殊人群点位展示，找不到组织的bug
|
3 years ago |
|
wxz
|
13a439f514
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
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
|
3 years ago |
|
wxz
|
8a060a2f7c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
wxz
|
3a000e56fd
|
特殊人群列表，增加所属组织的经纬度
|
3 years ago |
|
yinzuomei
|
e66923eca7
|
Merge remote-tracking branch 'origin/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
|
3 years ago |
|
luyan
|
f5c0502fed
|
修改归档率统计条件
|
3 years ago |
|
luyan
|
8c68941334
|
修改获取orgPath方法
|
3 years ago |
|
luyan
|
584f34cf28
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
20b7a726e2
|
增加归档功能和归档率统计
|
3 years ago |
|
yinzuomei
|
6c46f1c14d
|
灵山大屏中央区域:楼栋坐标分布/点击网格展示房屋分布点位/获取楼栋详情，未测试
|
3 years ago |
|
yinzuomei
|
e47b9fee7d
|
epmetuser/icresiuser/resi-brief/接口适配灵山。
|
3 years ago |
|
yinzuomei
|
9a1f7d7353
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
yinzuomei
|
9856b451b2
|
LingShanHelpCrowdTypeEnum重点帮扶人员类别枚举
|
3 years ago |
|
luyan
|
27cc4368c9
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
24401318b6
|
修改事件分类统计
|
3 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
|
3 years ago |
|
wxz
|
c6e9fbfadb
|
修改：部门，组织，网格增加description
|
3 years ago |
|
wxz
|
a33ecc2968
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
54965653da
|
修改：处理流程的顺序，按时间倒叙
|
3 years ago |
|
wxz
|
c0703a2296
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
luyan
|
e73289698b
|
修改事件删除bug;
|
3 years ago |
|
luyan
|
6b404024d4
|
修改事件查询错误；
|
3 years ago |
|
luyan
|
d7ee918a3b
|
修改事件回复Bug，根据ID查询事件错误；
|
3 years ago |
|
luyan
|
d4961c542a
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
06922d5f4e
|
测试事件编辑功能；
|
3 years ago |
|
wxz
|
58c8c9de5b
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
f4e0cf8089
|
-
|
3 years ago |
|
wxz
|
1ff1789b04
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
519af27c7a
|
-
|
3 years ago |
|
wxz
|
fcd722c313
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
f5468cfdc4
|
服务列表增加id返回
|
3 years ago |
|
wxz
|
57e2b56607
|
Merge branch 'lingshan_master' into dev
|
3 years ago |
|
wxz
|
ebd58115f6
|
modify
|
3 years ago |
|
wxz
|
e6b9cd5fb9
|
Merge branch 'master' into lingshan_master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java
|
3 years ago |
