Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 6349bdc821 烟台需求、新增小区 lichao 2023-05-06 14:59:05 +0800
• 0efcc3578f 楼栋单元长 yinzuomei 2023-05-06 14:58:57 +0800
• 0f0099afdc Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 14:33:42 +0800
• 2a2511d3e1 gov/org/propertymanagement/page新增联系人，联系电话 yinzuomei 2023-05-06 14:33:08 +0800
• a1f3b4579d Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 14:26:47 +0800
• 31fee9c480 烟台需求、新增组织字段 lichao 2023-05-06 14:26:36 +0800
• 6760a04f21 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 13:30:10 +0800
• 345b07392b Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 13:30:07 +0800
• 3d72b83b87 gov/org/propertymanagement/page新增联系人，联系电话 yinzuomei 2023-05-06 13:29:43 +0800
• 8ae98006d2 用户详情、修改 lichao 2023-05-06 13:27:12 +0800
• a544dcf96e Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-06 13:15:37 +0800
• 52c573be18 ic_property_management表新增联系人，联系电话 yinzuomei 2023-05-06 13:04:35 +0800
• b3dfe459a2 冲突解决 lichao 2023-05-06 11:02:07 +0800
• 0c42e94cc5 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-05-06 10:57:53 +0800
• d131fd9581 通讯录新增烟台需求字段 lichao 2023-05-06 10:52:52 +0800
• eea41134b6 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-05-05 17:50:00 +0800
• 2f8ff0b366 Merge remote-tracking branch 'origin/dev_bugfix_ljj' yinzuomei 2023-05-05 17:36:12 +0800
• c0b8e88121 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-05 14:29:41 +0800
• b511b7a667 FINISH_SEND_TIME yinzuomei 2023-05-05 14:27:50 +0800
• 690256a7f7 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-05 14:15:23 +0800
• 330e2bfc82 /message/organization/message/list;NullPointerException yinzuomei 2023-05-05 14:10:59 +0800
• 68887bbeb6 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-05 12:33:07 +0800
• 30c353f013 bugfix yinzuomei 2023-05-05 12:27:15 +0800
• 875324143e Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-05 10:51:16 +0800
• f8c5ae7324 发送消息 yinzuomei 2023-05-05 10:48:17 +0800
• 63810e45b0 Merge branch 'lingshan_master' into dev wxz 2023-05-05 09:15:28 +0800
• 4f23043d56 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-05 09:15:13 +0800
• 7659d2fc44 1.修改：删除文章栏目。禁止删除一级栏目 wxz 2023-05-05 09:14:03 +0800
• e037148819 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-05-05 08:41:48 +0800
• 09fc9988fb 保存了内容，还没发消息 yinzuomei 2023-05-04 18:32:22 +0800
• 4ae7d29190 1.修改：工作人员编辑页面初始化接口editstaffinit,增加idcard，culture,cultureDisplay字段的返回 wxz 2023-05-04 17:51:36 +0800
• 0fd79ffcb6 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-05-04 16:52:27 +0800
• 208d516403 工作人员缓存增加pid,orgIdPath yinzuomei 2023-05-04 16:49:25 +0800
• 0b71ba8f79 消息管理未完待续. yinzuomei 2023-05-04 16:32:17 +0800
• 88c600fbd1 Merge branch 'lingshan_master' into dev wxz 2023-05-04 15:29:33 +0800
• 033e59dc07 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-05-04 15:28:01 +0800
• 4f442eff01 1.修改：新增工作人员addstaffv2接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储 2.修改：编辑工作人员editstaff接口，增加文化程度的字段、idCard的字段，并且内部逻辑中，通过解析idCard得到出生日期，并且存储 wxz 2023-05-04 15:26:37 +0800
• 7e37e6e9f9 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-05-04 15:10:58 +0800
• f16974a20f Merge remote-tracking branch 'origin/master' wxz 2023-05-04 15:08:57 +0800
• 1b7c69afc2 修改身份证正则解析工具类，增加出生日期[LocalDate类型]的返回 wxz 2023-05-04 15:08:25 +0800
• 64976a43fa Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-05-04 13:50:14 +0800
• 5b69b9843e /resi/partymember/icPartyOrg/editPrincipal接口principalStaffId不必填； yinzuomei 2023-05-04 13:43:57 +0800
• 41b4180180 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-05-04 12:45:28 +0800
• 46b63638e8 【小组】大屏查询小组 wxz 2023-05-04 12:41:43 +0800
• 88c67fe4d1 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-28 17:55:33 +0800
• 1f0cb8d472 Merge branch 'master' into lingshan_master wxz 2023-04-28 17:47:53 +0800
• a6db5f9810 【小组】创建小组-增加orgIdpath,agencyId wxz 2023-04-28 17:39:01 +0800
• 3776c6fe21 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-28 17:21:00 +0800
• e53a097f99 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-28 16:23:02 +0800
• 2e1dfe9277 居民信息列表查询排序调整 yinzuomei 2023-04-28 16:18:44 +0800
• 62c4f7261b Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-28 14:08:46 +0800
• 6d9964e3a4 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-27 17:13:57 +0800
• 494b9881f1 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-04-27 17:08:55 +0800
• 638afa239e Merge branch 'lingshan_master' into dev wxz 2023-04-27 17:06:02 +0800
• c0f81da07f Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-27 17:05:59 +0800
• 67396a3ad1 特殊人群：增加查询各类人员分布了 wxz 2023-04-27 16:59:29 +0800
• e76e075c9c 市北反馈社区安全服务列表查询不出来 yinzuomei 2023-04-27 16:28:10 +0800
• a9c59473ed 特殊人群：增加柱状图和各类人员数量。下一步要查询各类人员分布了 wxz 2023-04-27 12:32:51 +0800
• 83132ff534 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-27 11:19:52 +0800
• abfa7fd337 部门导入组织编码文本格式 yinzuomei 2023-04-27 11:17:20 +0800
• 7e162798bc Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-27 10:26:46 +0800
• d12a227095 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-04-27 10:24:04 +0800
• d2bf511503 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-27 09:49:11 +0800
• 73d65e2eb9 同一组织下，部门名称唯一 yinzuomei 2023-04-27 09:36:25 +0800
• 6e2c8919f5 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-26 17:40:40 +0800
• 7d21bf38ec 同一组织下，部门名称唯一 yinzuomei 2023-04-26 17:36:09 +0800
• 65c5a18edc Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-26 17:26:16 +0800
• 0e9c256fd0 部门职责默认为空字符串 yinzuomei 2023-04-26 17:24:23 +0800
• 36a3124b6f Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-26 17:13:21 +0800
• 2e68db40a9 部门导入，微测试 yinzuomei 2023-04-26 17:09:59 +0800
• 650bea6c69 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-26 16:56:55 +0800
• 19f0c74add 部门导入，微测试 yinzuomei 2023-04-26 16:53:42 +0800
• 07aff3c6fc Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-26 12:43:31 +0800
• 343745bd0a 信息采集导出文件名 yinzuomei 2023-04-26 12:37:31 +0800
• 4dadc8c334 信息采集详情列表根据户主、状态查询 yinzuomei 2023-04-26 11:59:25 +0800
• dc8d20f7de 信息采集详情返回与户主关系名称 yinzuomei 2023-04-26 11:32:33 +0800
• 289f95387f Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-26 09:14:22 +0800
• f8b5bad49c 办事指南发布，pids值错误； yinzuomei 2023-04-25 17:58:25 +0800
• b83cb8ad35 办事指南发布，pids值错误 yinzuomei 2023-04-25 17:56:31 +0800
• a7fdde788d Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_bugfix_ljj yinzuomei 2023-04-25 17:34:20 +0800
• da489b7150 信息采集审核调整，微测试 yinzuomei 2023-04-25 17:31:56 +0800
• 0bae6a3147 特殊人群导入和新增，增加变更记录 wxz 2023-04-25 16:54:55 +0800
• ab8d39881b Merge branch 'master' into lingshan_master wxz 2023-04-25 16:04:13 +0800
• f18bb7b8ca 微调居民信息变更记录中的customerId，staffId的获取方式 wxz 2023-04-25 15:57:44 +0800
• 6be81b4f59 增加私有化部署的一点文档 wxz 2023-04-25 15:47:25 +0800
• 7f2f8f781c Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-25 15:44:55 +0800
• d999ffbe2e Merge branch 'lingshan_master' into dev wxz 2023-04-25 15:42:07 +0800
• e84fd03b6f Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-25 15:41:53 +0800
• 08369aff3d 1.文章栏目，增加tree接口 2.增加通过父id查询子栏目列表的接口 wxz 2023-04-25 15:39:11 +0800
• 0ab768080b Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-25 09:12:04 +0800
• de5dc99ba7 fix yinzuomei 2023-04-24 17:54:05 +0800
• 1fa5c9ecf7 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 17:30:28 +0800
• 633d391585 fix yinzuomei 2023-04-24 17:27:14 +0800
• 1d3e661ef1 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 17:15:23 +0800
• 6332e357bc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-24 17:04:45 +0800
• b7e03649ad fix yinzuomei 2023-04-24 17:03:16 +0800
• 49ed67321a Merge branch 'lingshan_master' into dev wxz 2023-04-24 17:01:49 +0800
• 34c319c035 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-24 17:01:16 +0800
• f5c05456da Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-24 17:00:07 +0800
• 927b4e5fd4 1.fix:特殊人群导入模板有问题 2.特殊人群新增，增加居民头像字段 3.特殊人群详情增加居民头像返回 4.特殊人群保存和详情的返回日期格式修改 wxz 2023-04-24 16:59:38 +0800