Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• d4758e0dad - master wxz 2023-05-22 18:45:01 +0800
• 758b63beac Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-22 17:09:34 +0800
• e974a2b8f7 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-22 16:55:16 +0800
• 2f0e4e5f80 修改大屏时间列表，增加检索事件分类条件查询 luyan 2023-05-22 16:54:30 +0800
• 8ea9460c54 修改，满意度字段名写错了。增加满意度中文字段 wxz 2023-05-22 16:35:58 +0800
• b695e57cde Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-22 14:14:08 +0800
• 4340254960 fix:【灵山-红色代办】导入+新增：orgIdPath计算错误 wxz 2023-05-22 13:43:32 +0800
• 31a6783850 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-22 13:25:39 +0800
• f8e1ae045d /epmetuser/icresiuser/ownerrelation yinzuomei 2023-05-22 10:26:39 +0800
• efd45b2db8 增加代办服务的权限枚举 wxz 2023-05-20 20:53:12 +0800
• 28bb7a5717 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-20 20:48:36 +0800
• df86e8524a 修改新村事件办理情况分析 luyan 2023-05-20 14:48:45 +0800
• 472b6b10d3 修改新村事件办理情况分析 luyan 2023-05-20 14:30:20 +0800
• 4d39cac6de 增加事件查询方式，增加新村事件办理情况分析 luyan 2023-05-20 13:45:01 +0800
• 4055311830 修改事件统计参数 luyan 2023-05-19 19:54:06 +0800
• 28beb1c06d 修改办理意见 luyan 2023-05-19 19:33:13 +0800
• 73a9a76e3d Merge remote-tracking branch 'origin/lingshan_master' into dev luyan 2023-05-19 19:13:46 +0800
• a46cb9a777 修改获取事件详情，增加返回eventType luyan 2023-05-19 19:12:06 +0800
• 93307c2a8c Merge remote-tracking branch 'origin/lingshan_master' into dev luyan 2023-05-19 18:55:32 +0800
• 4ec3475bc4 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-19 18:44:28 +0800
• ef2d639f59 增加事件回复修改功能； luyan 2023-05-19 18:43:54 +0800
• d0f4801e05 冲突 yinzuomei 2023-05-19 18:43:38 +0800
• ce4bde4faf 冲突 yinzuomei 2023-05-19 18:26:36 +0800
• f7649324d2 Merge remote-tracking branch 'origin/dev' into dev yinzuomei 2023-05-19 18:24:36 +0800
• e633374952 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-19 18:23:42 +0800
• 476d45fec4 合并冲突 yinzuomei 2023-05-19 18:21:07 +0800
• 22d60cda86 Merge remote-tracking branch 'origin/lingshan_master' into dev luyan 2023-05-19 18:18:05 +0800
• 1a35555949 待修改 luyan 2023-05-19 18:15:40 +0800
• 3662ce9346 合并冲突 yinzuomei 2023-05-19 18:15:08 +0800
• f674f8aef8 Merge remote-tracking branch 'origin/dev' into dev yinzuomei 2023-05-19 18:06:13 +0800
• aa9b98ff9b Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-19 18:01:14 +0800
• 225d8e7fed Merge remote-tracking branch 'origin/lingshan_master' into dev luyan 2023-05-19 17:59:56 +0800
• dedfc0635b Merge remote-tracking branch 'origin/dev' into dev luyan 2023-05-19 17:58:49 +0800
• 15e1318dda Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-19 17:55:40 +0800
• ac4b1dd1ef Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-19 17:53:34 +0800
• 15a544e856 重构事件统计分析； luyan 2023-05-19 17:53:06 +0800
• aa63a9bdd6 楼栋点位返回小区名成，房屋点位返回小区名，楼栋名，单元名 yinzuomei 2023-05-19 17:49:58 +0800
• f031e8c5af Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-19 16:21:52 +0800
• f668974585 定时任务一条一条更新 lichao 2023-05-19 16:17:16 +0800
• 66f5434622 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-19 15:16:34 +0800
• f9b699e450 爬取新增范围 lichao 2023-05-19 15:05:56 +0800
• 6e2f643507 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-19 14:12:33 +0800
• b994c33cb9 1 yinzuomei 2023-05-19 14:10:03 +0800
• d647f6997c Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-19 14:02:51 +0800
• a7eaf9a027 婚姻定时任务 lichao 2023-05-19 14:00:28 +0800
• 58e85fcfb9 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-19 11:16:38 +0800
• 095855db78 /icresiuser/resi-brief/+/data/aggregator/org/lianHuResi yinzuomei 2023-05-19 11:11:09 +0800
• 31b3c38625 pageSize yinzuomei 2023-05-19 10:23:00 +0800
• 50e66a20bd Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-19 10:07:40 +0800
• 8888215fd8 联户群众列表 yinzuomei 2023-05-19 10:01:04 +0800
• cd8f0f573d 大屏房屋列表。点击房屋查询联户坐标点位 yinzuomei 2023-05-18 19:17:55 +0800
• 465e4bb782 删除 yinzuomei 2023-05-18 18:35:28 +0800
• c6deed961e 提上去 yinzuomei 2023-05-18 18:33:05 +0800
• 9c3b219be8 没有用到 yinzuomei 2023-05-18 18:25:52 +0800
• aa5a85b9b1 houseDetail/{houseId}大屏房屋详情 yinzuomei 2023-05-18 18:07:10 +0800
• 249f976989 /epmetuser/icresiuser/ownerrelation调整适配灵山需求 yinzuomei 2023-05-18 17:29:30 +0800
• d4b7b40f9b 增加按事件来源分类统计占比 luyan 2023-05-18 17:28:43 +0800
• da8bcf10ca Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-18 17:31:07 +0800
• 4d146ae663 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-18 17:30:05 +0800
• af2936cfc1 /epmetuser/icresiuser/ownerrelation调整适配灵山需求 yinzuomei 2023-05-18 17:29:30 +0800
• 65b0a17f42 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-18 17:29:05 +0800
• 44376159eb 增加按事件来源分类统计占比 luyan 2023-05-18 17:28:43 +0800
• 538526a928 Merge branch 'lingshan_master' into dev wxz 2023-05-18 17:22:38 +0800
• a9b14fd3af fix:【灵山-特殊人群】大屏：特殊人群点位展示，找不到组织的bug wxz 2023-05-18 17:20:17 +0800
• 13a439f514 Merge remote-tracking branch 'origin/dev' into dev wxz 2023-05-18 16:14:20 +0800
• 1b3fefb073 Merge branch 'lingshan_master' into dev wxz 2023-05-18 16:14:03 +0800
• 8a060a2f7c Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-18 16:11:39 +0800
• 3a000e56fd 特殊人群列表，增加所属组织的经纬度 wxz 2023-05-18 16:10:40 +0800
• e66923eca7 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-18 16:07:25 +0800
• f5c0502fed 修改归档率统计条件 luyan 2023-05-18 15:54:35 +0800
• 8c68941334 修改获取orgPath方法 luyan 2023-05-18 15:45:40 +0800
• 584f34cf28 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-18 15:44:34 +0800
• 20b7a726e2 增加归档功能和归档率统计 luyan 2023-05-18 15:44:06 +0800
• 6c46f1c14d 灵山大屏中央区域:楼栋坐标分布/点击网格展示房屋分布点位/获取楼栋详情，未测试 yinzuomei 2023-05-18 15:20:12 +0800
• e47b9fee7d epmetuser/icresiuser/resi-brief/接口适配灵山。 yinzuomei 2023-05-18 15:06:19 +0800
• 9a1f7d7353 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-18 14:54:43 +0800
• 9856b451b2 LingShanHelpCrowdTypeEnum重点帮扶人员类别枚举 yinzuomei 2023-05-18 14:53:47 +0800
• 27cc4368c9 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-18 14:40:02 +0800
• 24401318b6 修改事件分类统计 luyan 2023-05-18 14:39:37 +0800
• 8465697305 Merge branch 'lingshan_master' into dev wxz 2023-05-18 13:30:28 +0800
• c6e9fbfadb 修改：部门，组织，网格增加description wxz 2023-05-18 11:11:56 +0800
• a33ecc2968 Merge branch 'lingshan_master' into dev wxz 2023-05-18 08:52:52 +0800
• 5e010966c2 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 23:43:13 +0800
• 54965653da 修改：处理流程的顺序，按时间倒叙 wxz 2023-05-17 23:40:39 +0800
• c0703a2296 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-17 23:37:36 +0800
• e73289698b 修改事件删除bug; luyan 2023-05-17 21:22:46 +0800
• 6b404024d4 修改事件查询错误； luyan 2023-05-17 21:15:57 +0800
• d7ee918a3b 修改事件回复Bug，根据ID查询事件错误； luyan 2023-05-17 21:03:21 +0800
• d4961c542a Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-17 20:20:58 +0800
• 06922d5f4e 测试事件编辑功能； luyan 2023-05-17 20:20:23 +0800
• cef532961a Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 18:05:15 +0800
• 58c8c9de5b Merge branch 'lingshan_master' into dev wxz 2023-05-17 18:02:34 +0800
• f4e0cf8089 - wxz 2023-05-17 18:01:19 +0800
• 1ff1789b04 Merge branch 'lingshan_master' into dev wxz 2023-05-17 17:53:43 +0800
• 519af27c7a - wxz 2023-05-17 17:49:23 +0800
• 6d3b85ceab Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 17:36:51 +0800
• fcd722c313 Merge branch 'lingshan_master' into dev wxz 2023-05-17 17:34:35 +0800
• f5468cfdc4 服务列表增加id返回 wxz 2023-05-17 17:31:55 +0800
• 57e2b56607 Merge branch 'lingshan_master' into dev wxz 2023-05-17 17:17:14 +0800
• ebd58115f6 modify wxz 2023-05-17 17:12:18 +0800