luyan
|
ca887f5815
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
ed04c168dd
|
灵山项目：事件统计返回模拟数据
|
2 years ago |
|
luyan
|
f25e650d0a
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
3e598561c8
|
灵山项目：事件统计返回模拟数据
|
2 years ago |
|
luyan
|
57bf29f43d
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
05daf4b39c
|
灵山项目：事件增加返回图片
|
2 years ago |
|
luyan
|
aae98b0c97
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
luyan
|
9630844e1c
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
1a6e3fcfe4
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
a58fa5c809
|
灵山项目：大屏居民搜索增加特殊人员类型和重点人员类型
|
2 years ago |
wxz
|
4922833a59
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
8f6e0421b5
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
136b55727e
|
【重点帮扶】：导入的时候，修改"开始享受月份"日期格式。增加对必填字段的@NotBlank注解
|
2 years ago |
|
luyan
|
3e2251e9f8
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
064379d3d2
|
灵山项目：修改企业巡查安全隐患存在与否的错误
|
2 years ago |
|
luyan
|
db32093a2f
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
eb83912106
|
灵山项目：安全生产企业列表增加是否是重点企业判断
|
2 years ago |
|
luyan
|
80f64854b5
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
1474863dc6
|
灵山项目：安全生产企业列表增加隐患条件；
|
2 years ago |
|
wxz
|
e9bcec9d74
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
09fe4d57e7
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
ef0dec949d
|
灵山项目：移除事件复查隐患类型必填项目
|
2 years ago |
|
wxz
|
35a36f1288
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
299c4ac4f3
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
4d2a53b8e2
|
【重点帮扶】：导入、保存的时候，增加针对居民信息的变更记录
【社会服务资源】根据分类列表查询：增加网格员id返回:gridUserId
|
2 years ago |
|
luyan
|
adf8d9bcc5
|
灵山项目：事件处理编辑，增加返回处理人ID
|
2 years ago |
|
luyan
|
4fd87bf3a6
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
436bdad5ef
|
灵山项目：事件处理编辑，增加返回处理人ID
|
2 years ago |
|
wxz
|
4cf1a947bf
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
fe01d2a15a
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan
|
2 years ago |
|
wxz
|
cb614f163c
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
186110e97b
|
【重点帮扶】：导入、保存的时候，增加针对居民信息更新的回调
|
2 years ago |
|
luyan
|
4c69fe5c0c
|
灵山项目：增加按网格查询网格员
|
2 years ago |
|
wxz
|
674763a485
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
0375d3a245
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
c1630d3489
|
灵山项目：修改事件回复时，如果选择网格员，则该处理人ID变为网格员的ID
|
2 years ago |
|
luyan
|
8faf395127
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
9c634768b9
|
灵山项目：修改参数判断错误
|
2 years ago |
|
luyan
|
4de26b24a5
|
灵山项目：修改参数判断错误
|
2 years ago |
|
luyan
|
20db6168ab
|
灵山项目：增加通过staffID获取事件
|
2 years ago |
|
luyan
|
a192a43fea
|
灵山项目：增加返回年龄和性别
|
2 years ago |
|
luyan
|
5fbdbacba4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
luyan
|
920b1d94df
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
luyan
|
ecee67107b
|
灵山项目：修改工作人员获取角色错误的问题，增加返回工作人员名族和网格名称；
|
2 years ago |
|
luyan
|
c9cfd76cb3
|
灵山项目：增加返回管理员角色：ROLE_NAME，增加返回网格员组织ID，组织+网格名称
|
2 years ago |
|
luyan
|
1492a39af0
|
灵山项目：增加返回管理员角色：ROLE_KEY
|
2 years ago |
|
wxz
|
86ab8775b5
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
2 years ago |
|
wxz
|
2408d2c233
|
fix:【灵山大屏】特殊人群，到了社区层级显示不出来网格的特殊人群数量。fix:【灵山大屏】党建活动，查询逻辑调整为：查询发布到当前党组织及下级的活动数量
|
2 years ago |
|
wxz
|
5ec97dda3b
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
4cf6d58b30
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
