Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• e6b9cd5fb9 Merge branch 'master' into lingshan_master wxz 2023-05-17 17:00:48 +0800
• 9f35c48683 Merge branch 'lingshan_master' into dev wxz 2023-05-17 16:56:30 +0800
• 729e17cda6 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 16:55:57 +0800
• a772b088da Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-17 16:55:45 +0800
• 0e18844166 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-17 16:53:34 +0800
• 79bf2c6ce1 新增：【灵山街道】大屏，代办服务详情（处理进展） wxz 2023-05-17 16:53:10 +0800
• 72bb63e0ba 房屋管理-房屋列表、查看详情、社区查询（房屋）统一返回partyCenterHouseFlag yinzuomei 2023-05-17 16:44:14 +0800
• 809c58f845 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 16:16:12 +0800
• 05f37c85ce 绑定联户调整。党员信息导入调整 yinzuomei 2023-05-17 16:13:06 +0800
• 5652b0a806 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 15:38:38 +0800
• c527311c6d 忘了赋值 yinzuomei 2023-05-17 15:30:19 +0800
• ab92424f90 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 15:17:47 +0800
• 73c5879752 更新房屋是否党员中心户，加个房屋变更记录 yinzuomei 2023-05-17 15:11:15 +0800
• 4a1e3ccdc3 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-17 15:03:22 +0800
• 60f0004ed4 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 14:31:35 +0800
• b90add68e6 test yinzuomei 2023-05-17 14:28:22 +0800
• 511eaab4ee 死亡拉取 lichao 2023-05-17 14:17:29 +0800
• 7ea467d5ef modify... wxz 2023-05-17 14:16:32 +0800
• 1c017f729b Merge branch 'master' into dev wxz 2023-05-17 14:07:19 +0800
• 2ca1202040 Merge branch 'master' into lingshan_master wxz 2023-05-17 14:03:48 +0800
• effcb40ce6 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-17 14:03:47 +0800
• 465222149b 增加一个居民信息导入的postProcessor wxz 2023-05-17 14:03:22 +0800
• c12acd6c14 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 13:49:05 +0800
• ba94f0b41d 等会再改 yinzuomei 2023-05-17 13:45:52 +0800
• d9a8ce711a 等会再改 yinzuomei 2023-05-17 13:43:18 +0800
• 662d68a165 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 13:18:53 +0800
• 547f9da83d 新增，编辑，删除居民，更新房屋是否是党员中心户 yinzuomei 2023-05-17 13:13:31 +0800
• fdf9a82f62 去掉一个GovOrgOpenFeignClient yinzuomei 2023-05-17 12:06:38 +0800
• cc18fc8dc8 直接在dev改 yinzuomei 2023-05-17 11:14:38 +0800
• 3164b2bee6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-17 11:05:00 +0800
• f804020c6d 增加事件回复表单参数； luyan 2023-05-17 11:04:27 +0800
• cb1d4fb2dd Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 10:59:43 +0800
• f664a2eb10 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 10:57:16 +0800
• aebfdf7239 修改事件，增加处理流程表单参数 luyan 2023-05-17 10:56:52 +0800
• ab8c6f89e2 优化依赖关系 luyan 2023-05-17 10:56:17 +0800
• d43275feaf Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 10:54:27 +0800
• b0d9d88526 常量参数 luyan 2023-05-17 10:54:02 +0800
• 9ec541a4f7 移除钉钉 luyan 2023-05-17 10:53:44 +0800
• 008a2aae1e baseDao.selectListPartyCenterHouse( yinzuomei 2023-05-17 10:53:03 +0800
• b9d9fdbee7 移除钉钉 luyan 2023-05-17 10:52:48 +0800
• bffd011bb3 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-05-17 10:51:00 +0800
• b0b9e9e350 移除新增事件管理 luyan 2023-05-17 10:50:06 +0800
• 3eb3ef92ca 合并冲突 yinzuomei 2023-05-17 10:43:53 +0800
• b5d347347f Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-17 10:42:45 +0800
• fe5d764f26 queryLianHuHouse yinzuomei 2023-05-17 10:34:21 +0800
• eda679a8d9 绑定联户入参调整 yinzuomei 2023-05-17 10:21:05 +0800
• 09404bf3c4 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 10:18:23 +0800
• 3ab1782fa5 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 10:18:07 +0800
• f9481afd6b Merge branch 'lingshan_master' into dev wxz 2023-05-17 10:17:51 +0800
• 543acebce2 partyCenterHouseFlag yinzuomei 2023-05-17 10:17:01 +0800
• c19a23c44e Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 10:14:35 +0800
• 88da1b9907 修改:【灵山-红色待办】大屏-服务列表，增加agentId代办员id参数 wxz 2023-05-17 10:14:19 +0800
• 75b5d35463 网格下的小区树：gov/org/ichouse/housetree yinzuomei 2023-05-17 10:13:54 +0800
• 0c4ee80dfb Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-17 09:59:00 +0800
• 7f907fd422 Merge branch 'lingshan_master' into dev wxz 2023-05-17 09:58:24 +0800
• 73c04875b9 fix:【灵山-红色待办】居民端提交，缺少经纬度字段保存 fix:【灵山-红色待办】大屏中央，代办员，服务的数量查询错误 wxz 2023-05-17 09:55:36 +0800
• 1285327a7c Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-17 09:44:10 +0800
• 722cd256d9 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-17 09:19:42 +0800
• 8c0de433b5 联户绑定，可任意勾选小区/楼栋/单元/房屋 yinzuomei 2023-05-17 09:19:01 +0800
• 209d4fadc5 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-16 21:26:56 +0800
• 9d269d79da Merge branch 'lingshan_master' into dev wxz 2023-05-16 21:26:43 +0800
• 6f9578f3f6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-16 21:24:17 +0800
• 79167af633 党建引领：大屏中央，当相关对象目录数量查询错误 wxz 2023-05-16 21:23:59 +0800
• fcfa14bffd Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-16 20:41:42 +0800
• 4497b26210 未完待续。。。md yinzuomei 2023-05-16 20:40:26 +0800
• cb3f6cadcc Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-16 20:29:43 +0800
• 1d90fde163 增加办结率数值返回 wxz 2023-05-16 20:27:55 +0800
• 91e9af9228 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-16 19:47:09 +0800
• aa634ef0eb Merge branch 'lingshan_master' into dev wxz 2023-05-16 19:44:24 +0800
• bdf159522c Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-16 19:39:57 +0800
• 51fc695173 fix:【灵山大屏】代办服务类型分析报错 wxz 2023-05-16 19:39:42 +0800
• c3091361ed Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-16 19:01:49 +0800
• 5c9d9c2995 灵山：绑定联户 yinzuomei 2023-05-16 19:00:51 +0800
• b7758226f8 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-16 17:58:22 +0800
• 78a96ecd23 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-16 17:56:24 +0800
• defddf443f fix:【灵山大屏】党组织树查询党员查不到的bug wxz 2023-05-16 17:56:02 +0800
• 7698e0592b ic_house房屋表新增：PARTY_CENTER_HOUSE_FLAG：灵山项目：是否党员中心户：1是；0不是 yinzuomei 2023-05-16 17:42:53 +0800
• dbb7b23d49 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-16 16:13:48 +0800
• b49f338d17 补充网络资源访问需求 wxz 2023-05-16 15:43:06 +0800
• 0c482607b9 Merge branch 'lingshan_master' into dev wxz 2023-05-16 15:26:05 +0800
• ff2f8d2e88 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-16 15:25:59 +0800
• d912a0f476 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-16 15:18:44 +0800
• a6585ea3cd 申请日期可以不填写 yinzuomei 2023-05-16 15:08:32 +0800
• 1de6db0439 申请开始日期、结束日期、办结开始、办结结束 yinzuomei 2023-05-16 14:53:28 +0800
• be3e84f741 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-16 14:50:02 +0800
• ffcaa6495c 新增：服务类型数量分析+代办服务趋势分析 wxz 2023-05-16 14:49:11 +0800
• a77f9ab458 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-16 14:46:13 +0800
• ef533b8c37 申请开始日期、结束日期、办结开始、办结结束 yinzuomei 2023-05-16 14:39:38 +0800
• a4bae4cc59 去掉111 yinzuomei 2023-05-16 14:29:46 +0800
• 9cf45385b6 办事大厅管理端end yinzuomei 2023-05-16 14:26:51 +0800
• 483b09460b Merge branch 'lingshan_master' into dev wxz 2023-05-16 09:10:16 +0800
• 4aae44c37b Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-15 20:42:44 +0800
• 937112c4bd 房屋新增和修改，增加经纬度 wxz 2023-05-15 20:39:42 +0800
• 2af6d0c8b9 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-05-15 20:34:17 +0800
• 929189c56f 灵山大屏中央一波代码。还大屏上代办员的代办列表接口没写，明天写 wxz 2023-05-15 20:33:54 +0800
• 3b5eca8f47 办事大厅，待测试 yinzuomei 2023-05-15 18:33:46 +0800
• 93acfb9a33 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-05-15 15:42:22 +0800
• 51113bdb38 生产企业类型统计-点击饼图列表（详情）通用 yinzuomei 2023-05-15 15:32:04 +0800
• 4eafee4656 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-05-15 14:43:02 +0800
• 09d2005fb8 生产企业类型统计-饼图 yinzuomei 2023-05-15 14:40:17 +0800