wxz
|
d4758e0dad
|
-
|
3 years ago |
|
wxz
|
758b63beac
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
luyan
|
e974a2b8f7
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
2f0e4e5f80
|
修改大屏时间列表，增加检索事件分类条件查询
|
3 years ago |
|
wxz
|
8ea9460c54
|
修改，满意度字段名写错了。增加满意度中文字段
|
3 years ago |
|
wxz
|
b695e57cde
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wxz
|
4340254960
|
fix:【灵山-红色代办】导入+新增：orgIdPath计算错误
|
3 years ago |
|
wxz
|
31a6783850
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
yinzuomei
|
f8e1ae045d
|
/epmetuser/icresiuser/ownerrelation
|
3 years ago |
|
wxz
|
efd45b2db8
|
增加代办服务的权限枚举
|
3 years ago |
|
wxz
|
28bb7a5717
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
3 years ago |
|
luyan
|
df86e8524a
|
修改新村事件办理情况分析
|
3 years ago |
|
luyan
|
472b6b10d3
|
修改新村事件办理情况分析
|
3 years ago |
|
luyan
|
4d39cac6de
|
增加事件查询方式，增加新村事件办理情况分析
|
3 years ago |
|
luyan
|
4055311830
|
修改事件统计参数
|
3 years ago |
|
luyan
|
28beb1c06d
|
修改办理意见
|
3 years ago |
|
luyan
|
73a9a76e3d
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
luyan
|
a46cb9a777
|
修改获取事件详情，增加返回eventType
|
3 years ago |
|
luyan
|
93307c2a8c
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
luyan
|
4ec3475bc4
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
ef2d639f59
|
增加事件回复修改功能；
|
3 years ago |
|
yinzuomei
|
d0f4801e05
|
冲突
|
3 years ago |
|
yinzuomei
|
ce4bde4faf
|
冲突
|
3 years ago |
|
yinzuomei
|
f7649324d2
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
yinzuomei
|
e633374952
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
yinzuomei
|
476d45fec4
|
合并冲突
|
3 years ago |
|
luyan
|
22d60cda86
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
luyan
|
1a35555949
|
待修改
|
3 years ago |
|
yinzuomei
|
3662ce9346
|
合并冲突
|
3 years ago |
|
yinzuomei
|
f674f8aef8
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 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
|
3 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
|
3 years ago |
|
luyan
|
dedfc0635b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
luyan
|
15e1318dda
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
ac4b1dd1ef
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
3 years ago |
|
luyan
|
15a544e856
|
重构事件统计分析；
|
3 years ago |
|
yinzuomei
|
aa63a9bdd6
|
楼栋点位返回小区名成，房屋点位返回小区名，楼栋名，单元名
|
3 years ago |
lichao
|
f031e8c5af
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
|
lichao
|
f668974585
|
定时任务一条一条更新
|
3 years ago |
|
lichao
|
66f5434622
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
|
lichao
|
f9b699e450
|
爬取新增范围
|
3 years ago |
|
yinzuomei
|
6e2f643507
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
yinzuomei
|
b994c33cb9
|
1
|
3 years ago |
|
lichao
|
d647f6997c
|
Merge branch 'yantai_zhengwu_master' into dev
|
3 years ago |
|
lichao
|
a7eaf9a027
|
婚姻定时任务
|
3 years ago |
|
yinzuomei
|
58e85fcfb9
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
3 years ago |
|
yinzuomei
|
095855db78
|
/icresiuser/resi-brief/+/data/aggregator/org/lianHuResi
|
3 years ago |
|
yinzuomei
|
31b3c38625
|
pageSize
|
3 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
|
3 years ago |
|
yinzuomei
|
8888215fd8
|
联户群众列表
|
3 years ago |
