yinzuomei
|
ce4bde4faf
|
冲突
|
2 years ago |
|
yinzuomei
|
f7649324d2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
yinzuomei
|
e633374952
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
476d45fec4
|
合并冲突
|
2 years ago |
luyan
|
22d60cda86
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
luyan
|
1a35555949
|
待修改
|
2 years ago |
|
yinzuomei
|
3662ce9346
|
合并冲突
|
2 years ago |
|
yinzuomei
|
f674f8aef8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
yinzuomei
|
aa9b98ff9b
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
|
2 years ago |
|
luyan
|
225d8e7fed
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
|
2 years ago |
|
luyan
|
dedfc0635b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
luyan
|
15e1318dda
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
ac4b1dd1ef
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
15a544e856
|
重构事件统计分析；
|
2 years ago |
|
yinzuomei
|
aa63a9bdd6
|
楼栋点位返回小区名成，房屋点位返回小区名，楼栋名，单元名
|
2 years ago |
lichao
|
f031e8c5af
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
f668974585
|
定时任务一条一条更新
|
2 years ago |
|
lichao
|
66f5434622
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
f9b699e450
|
爬取新增范围
|
2 years ago |
|
yinzuomei
|
6e2f643507
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
b994c33cb9
|
1
|
2 years ago |
|
lichao
|
d647f6997c
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
a7eaf9a027
|
婚姻定时任务
|
2 years ago |
|
yinzuomei
|
58e85fcfb9
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
095855db78
|
/icresiuser/resi-brief/+/data/aggregator/org/lianHuResi
|
2 years ago |
|
yinzuomei
|
31b3c38625
|
pageSize
|
2 years ago |
|
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
|
2 years ago |
|
yinzuomei
|
8888215fd8
|
联户群众列表
|
2 years ago |
|
yinzuomei
|
cd8f0f573d
|
大屏房屋列表。点击房屋查询联户坐标点位
|
2 years ago |
|
yinzuomei
|
465e4bb782
|
删除
|
2 years ago |
|
yinzuomei
|
c6deed961e
|
提上去
|
2 years ago |
|
yinzuomei
|
9c3b219be8
|
没有用到
|
2 years ago |
|
yinzuomei
|
aa5a85b9b1
|
houseDetail/{houseId}大屏房屋详情
|
2 years ago |
|
yinzuomei
|
249f976989
|
/epmetuser/icresiuser/ownerrelation调整适配灵山需求
|
2 years ago |
|
luyan
|
d4b7b40f9b
|
增加按事件来源分类统计占比
|
2 years ago |
|
yinzuomei
|
da8bcf10ca
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
4d146ae663
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
af2936cfc1
|
/epmetuser/icresiuser/ownerrelation调整适配灵山需求
|
2 years ago |
|
luyan
|
65b0a17f42
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
44376159eb
|
增加按事件来源分类统计占比
|
2 years ago |
wxz
|
538526a928
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
a9b14fd3af
|
fix:【灵山-特殊人群】大屏：特殊人群点位展示，找不到组织的bug
|
2 years ago |
|
wxz
|
13a439f514
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 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
|
2 years ago |
|
wxz
|
8a060a2f7c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
3a000e56fd
|
特殊人群列表，增加所属组织的经纬度
|
2 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
|
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 |
