epmet-cloud-yifengdian

4922833a59 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-06 17:11:15 +0800
8f6e0421b5 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-06-06 17:09:31 +0800
136b55727e 【重点帮扶】：导入的时候，修改"开始享受月份"日期格式。增加对必填字段的@NotBlank注解 wxz 2023-06-06 17:08:07 +0800
3e2251e9f8 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-06 16:17:05 +0800
064379d3d2 灵山项目：修改企业巡查安全隐患存在与否的错误 luyan 2023-06-06 16:13:40 +0800
db32093a2f Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-06 15:48:46 +0800
eb83912106 灵山项目：安全生产企业列表增加是否是重点企业判断 luyan 2023-06-06 15:44:53 +0800
80f64854b5 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-06 15:11:08 +0800
1474863dc6 灵山项目：安全生产企业列表增加隐患条件； luyan 2023-06-06 15:06:09 +0800
e9bcec9d74 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-06-06 13:57:16 +0800
09fe4d57e7 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-06 10:47:30 +0800
ef0dec949d 灵山项目：移除事件复查隐患类型必填项目 luyan 2023-06-06 10:41:51 +0800
35a36f1288 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-05 17:45:15 +0800
299c4ac4f3 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-06-05 17:43:37 +0800
4d2a53b8e2 【重点帮扶】：导入、保存的时候，增加针对居民信息的变更记录【社会服务资源】根据分类列表查询：增加网格员id返回:gridUserId wxz 2023-06-05 17:42:17 +0800
adf8d9bcc5 灵山项目：事件处理编辑，增加返回处理人ID luyan 2023-06-05 17:38:38 +0800
4fd87bf3a6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-06-05 17:36:58 +0800
436bdad5ef 灵山项目：事件处理编辑，增加返回处理人ID luyan 2023-06-05 17:36:39 +0800
4cf1a947bf Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-05 17:01:38 +0800
fe01d2a15a Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan wxz 2023-06-05 17:01:15 +0800
cb614f163c Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-06-05 16:58:55 +0800
186110e97b 【重点帮扶】：导入、保存的时候，增加针对居民信息更新的回调 wxz 2023-06-05 16:58:30 +0800
4c69fe5c0c 灵山项目：增加按网格查询网格员 luyan 2023-06-05 16:09:49 +0800
674763a485 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-06-05 14:43:57 +0800
0375d3a245 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-05 10:36:53 +0800
c1630d3489 灵山项目：修改事件回复时，如果选择网格员，则该处理人ID变为网格员的ID luyan 2023-06-05 10:20:40 +0800
8faf395127 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-02 20:08:25 +0800
9c634768b9 灵山项目：修改参数判断错误 luyan 2023-06-02 19:59:37 +0800
4de26b24a5 灵山项目：修改参数判断错误 luyan 2023-06-02 19:53:38 +0800
20db6168ab 灵山项目：增加通过staffID获取事件 luyan 2023-06-02 18:32:08 +0800
a192a43fea 灵山项目：增加返回年龄和性别 luyan 2023-06-02 15:46:48 +0800
5fbdbacba4 Merge remote-tracking branch 'origin/master' luyan 2023-06-02 14:29:10 +0800
920b1d94df Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-02 14:28:20 +0800
ecee67107b 灵山项目：修改工作人员获取角色错误的问题，增加返回工作人员名族和网格名称； luyan 2023-06-02 14:23:45 +0800
c9cfd76cb3 灵山项目：增加返回管理员角色：ROLE_NAME，增加返回网格员组织ID，组织+网格名称 luyan 2023-06-02 13:35:37 +0800
1492a39af0 灵山项目：增加返回管理员角色：ROLE_KEY luyan 2023-06-02 12:10:45 +0800
86ab8775b5 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-02 11:14:22 +0800
2408d2c233 fix:【灵山大屏】特殊人群，到了社区层级显示不出来网格的特殊人群数量。fix:【灵山大屏】党建活动，查询逻辑调整为：查询发布到当前党组织及下级的活动数量 wxz 2023-06-02 11:11:45 +0800
5ec97dda3b Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-06-02 09:55:31 +0800
4cf6d58b30 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-06-02 09:25:35 +0800
66ac4693f7 灵山项目：修改更新网格员信息的方法； luyan 2023-06-02 09:24:59 +0800
0af28dcf1d Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-02 09:23:06 +0800
5899a16140 fix:大屏中央：联建单位没有显示名字id等信息(直接convert，属性名称没对上) wxz 2023-06-02 09:17:33 +0800
3e4e60874a Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-06-02 09:12:08 +0800
9ab0d52aca Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-06-01 20:11:49 +0800
72a5dd0fc4 灵山项目：修改更新网格员信息的方法； luyan 2023-06-01 20:06:23 +0800
e5602b4a2d 灵山项目：修改查询网格员列传参方式，增加返回政治面貌属性 luyan 2023-06-01 19:31:52 +0800
f95c1a2d72 灵山项目：工作人员信息，增加政治面貌 luyan 2023-06-01 18:47:13 +0800
978384c6c9 灵山项目：增加工作人员信息，修改编辑工作人员错误的问题； luyan 2023-06-01 17:14:49 +0800
409027c112 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-06-01 16:00:31 +0800
172caad068 灵山项目：修改工作人员查询，可以通过人名、电话、工作方式检索； luyan 2023-06-01 16:00:02 +0800
13941158a3 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-01 15:08:15 +0800
9d5dff9ad6 修改【灵山-便民服务-社区服务次数（公共服务）】大屏：柱状图统计 wxz 2023-06-01 15:04:43 +0800
fa294b72b6 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan wxz 2023-06-01 14:11:43 +0800
4b070917eb Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-06-01 14:11:23 +0800
125748cd75 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-06-01 11:29:36 +0800
558b4921b3 新增【灵山-便民服务-社区服务次数（公共服务）】大屏：柱状图统计 wxz 2023-06-01 11:29:03 +0800
11359bc7f4 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-05-31 18:42:52 +0800
55006d04d1 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-31 18:39:03 +0800
7ea4fc0da0 灵山项目：移除增加事件巡查记录的安全类型； luyan 2023-05-31 18:38:40 +0800
70b50b3a53 Merge remote-tracking branch 'origin/master' luyan 2023-05-31 18:14:23 +0800
ada3b8dcf7 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 17:14:02 +0800
ccc481f5b1 fix wxz 2023-05-31 17:10:28 +0800
19893705b6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-31 17:06:10 +0800
9d587d8a42 新增：根据角色可以列表+组织id，查询组织下所有具有该角色的工作人员信息，分页 wxz 2023-05-31 17:05:48 +0800
8f533ea410 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud luyan 2023-05-31 16:50:37 +0800
3bf41e01b6 灵山项目：修改按新村统计各网格数据sql； luyan 2023-05-31 16:48:03 +0800
dc21705828 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 15:20:01 +0800
3ceba67316 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan wxz 2023-05-31 15:19:26 +0800
a85b1c01e6 增加确实的依赖，排除多余的依赖； luyan 2023-05-31 15:14:54 +0800
1d2723f99e 灵山项目：修改按新村统计各网格数据sql； luyan 2023-05-31 13:17:31 +0800
4a9fe3bf9e Merge remote-tracking branch 'origin/master' wxz 2023-05-31 11:57:39 +0800
d43a654069 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 11:56:10 +0800
71cd4bedcd Merge remote-tracking branch 'orgin_elink/lingshan_master' yinzuomei 2023-05-31 11:49:51 +0800
f61033e4ad 灵山项目：修改按新村统计各网格数据时不显示的问题； luyan 2023-05-31 11:16:40 +0800
5c7aa39250 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 10:59:51 +0800
ad8ad0dd51 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-31 10:20:06 +0800
7ad5a2d4e0 灵山项目：大屏隐患排查中，增加隐患类型 luyan 2023-05-31 10:19:46 +0800
63f019eb24 fix：党群服务中心地图打点，没有返回id和名称 wxz 2023-05-31 10:14:37 +0800
660479caa8 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 10:04:04 +0800
1c0820994f Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-31 10:00:00 +0800
6b11b84ecd 灵山项目：移除复查记录中的安全隐患类型 luyan 2023-05-31 09:56:29 +0800
312cb3d524 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-31 09:02:27 +0800
9127653770 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-30 18:08:20 +0800
84a8e4887e 灵山项目：大屏安全生产企业--存在隐患交互接口,增加上报人和电话 luyan 2023-05-30 18:07:54 +0800
5f7e1ff9d7 不注释了 yinzuomei 2023-05-30 18:02:20 +0800
1453ca528f 办事大厅大屏柱状图 yinzuomei 2023-05-30 17:53:46 +0800
d3efc4cd2c Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-30 17:50:30 +0800
8824a33bb3 办事大厅大屏柱状图 yinzuomei 2023-05-30 17:49:57 +0800
fa1bda4845 灵山项目：大屏安全生产企业--存在隐患交互接口 luyan 2023-05-30 17:32:40 +0800
5643ae0b58 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-30 17:30:37 +0800
ec5ab68022 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-30 17:27:26 +0800
de5a30f5a2 fix：特殊人群 wxz 2023-05-30 17:27:03 +0800
f4fa3c0ced Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-30 17:04:21 +0800
a8dcb18844 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-30 16:59:18 +0800
e39505cd00 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-30 16:57:40 +0800
add3a20c04 灵山项目：安全生产企业、巡查次数、隐患数量统计 luyan 2023-05-30 16:57:17 +0800
f12f00844b fix：特殊人群，警长患者->危险性等级枚举错误 wxz 2023-05-30 16:56:17 +0800
2ebbe7fa03 修改：【社会服务资源】大屏：新增两个接口 wxz 2023-05-30 16:16:42 +0800
b3ec180bc4 修改：【公共服务图层】新增，导入，列表，修改：增加片区民警+网格员信息参数 wxz 2023-05-30 15:20:21 +0800

Commit Graph Select branches Hide Pull Requests master Mono Color

Commit Graph

Select branches

Hide Pull Requests

master