wxz
|
ff2f8d2e88
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
yinzuomei
|
a77f9ab458
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
ef533b8c37
|
申请开始日期、结束日期、办结开始、办结结束
|
2 years ago |
|
yinzuomei
|
a4bae4cc59
|
去掉111
|
2 years ago |
|
yinzuomei
|
9cf45385b6
|
办事大厅管理端end
|
2 years ago |
|
wxz
|
483b09460b
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
|
2 years ago |
|
wxz
|
4aae44c37b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
937112c4bd
|
房屋新增和修改，增加经纬度
|
2 years ago |
|
wxz
|
2af6d0c8b9
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
929189c56f
|
灵山大屏中央一波代码。还大屏上代办员的代办列表接口没写，明天写
|
2 years ago |
|
yinzuomei
|
3b5eca8f47
|
办事大厅，待测试
|
2 years ago |
|
yinzuomei
|
93acfb9a33
|
Merge remote-tracking branch 'origin/lingshan_master' into dev
|
2 years ago |
|
yinzuomei
|
51113bdb38
|
生产企业类型统计-点击饼图列表（详情）通用
|
2 years ago |
|
yinzuomei
|
4eafee4656
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
09d2005fb8
|
生产企业类型统计-饼图
|
2 years ago |
|
wxz
|
351a3bc6a1
|
内容审核增加开关标志，关闭的时候自动返回true成功
|
2 years ago |
|
wxz
|
eb9e33d3e4
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
wxz
|
6bf9d9732d
|
内容审核增加开关标志，关闭的时候自动返回true成功
|
2 years ago |
lichao
|
4b7e920967
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
f061135c23
|
楼洞导出删除类型
|
2 years ago |
|
lichao
|
0aef886d57
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
c2205665d5
|
删除类型
|
2 years ago |
|
wxz
|
a55ab6f58b
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
|
wxz
|
ca0a27d36c
|
【灵山-代办服务】调整pc端列表接口必填项。撤回，驳回等，都给processTime赋值
|
2 years ago |
|
wxz
|
f8337eedd0
|
Merge branch 'lingshan_master' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
|
2 years ago |
|
wxz
|
c052c7d392
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
wxz
|
d7fe8bedc2
|
【灵山-党建引领】1.新增：大屏中间，各党相关对象的数量统计。2：新增：党组织逐级点入，根据行政组织id查询下级党相关对象的名称，坐标，党员数量
|
2 years ago |
|
yinzuomei
|
9f179cfe59
|
楼长单元长类型，多选。
|
2 years ago |
|
lichao
|
a5418a6368
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
2 years ago |
|
lichao
|
0ce47b432e
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
cf2d8be960
|
楼洞详情
|
2 years ago |
|
yinzuomei
|
3e96fbf248
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
d304ee853c
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
aecd032441
|
修改楼洞详情
|
2 years ago |
|
yinzuomei
|
c403082292
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
3b6c6202e1
|
物业列表按照管理小区数量降序
|
2 years ago |
|
lichao
|
770d2d6e52
|
楼洞修改
|
2 years ago |
|
lichao
|
4c6c68ee89
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
f2786fcdb7
|
导入小区物业关联
|
2 years ago |
|
wxz
|
bc27769823
|
写点文档
|
2 years ago |
|
wxz
|
f0b6438122
|
写点文档
|
2 years ago |
|
wxz
|
965f109f36
|
增加日志调错。。。
|
2 years ago |
|
wxz
|
39624a5cf5
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
lichao
|
7f21071bcc
|
Merge branch 'yantai_zhengwu_master' into dev
|
2 years ago |
|
lichao
|
a9af7fa940
|
excel调整
|
2 years ago |
|
lichao
|
0c0d7f2f8b
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
2 years ago |
|
lichao
|
81c12e037d
|
错误信息修改
|
2 years ago |
|
yinzuomei
|
fd70053de1
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
2 years ago |
|
yinzuomei
|
17b309f8cb
|
楼张单元长导入模板调整。
|
2 years ago |
|
wxz
|
7d5ced1803
|
Merge branch 'lingshan_master' into dev
|
2 years ago |
