epmet-cloud-rizhao0920

6e771a6d2d 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type yinzuomei 2023-05-06 21:15:07 +0800
c7b0737836 烟台居民信息增加重点人群、国籍、人口类型、整治面貌；修改证件类型值 yinzuomei 2023-05-06 20:43:04 +0800
c2d026d09f Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-05-06 19:39:03 +0800
049c9b47af 新增客户修改 lichao 2023-05-06 19:38:53 +0800
48183b6fe8 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 18:48:31 +0800
1de597c2c2 dictOption/{dictType} yinzuomei 2023-05-06 18:48:06 +0800
05f60d3778 新增详情 lichao 2023-05-06 18:31:14 +0800
7eb166e073 修改组织 lichao 2023-05-06 18:28:45 +0800
e645887c25 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 18:02:13 +0800
d3009dfeaf 新增和编辑居民，证件类型必填 yinzuomei 2023-05-06 18:01:52 +0800
6f58e99138 房屋新增 lichao 2023-05-06 16:10:43 +0800
6453e1c296 区县、街道、社区下拉框 yinzuomei 2023-05-06 15:43:52 +0800
1d6f0a7854 楼栋单元长fix yinzuomei 2023-05-06 15:25:18 +0800
eab3d329f1 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-05-06 15:01:04 +0800
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
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
3d72b83b87 gov/org/propertymanagement/page新增联系人，联系电话 yinzuomei 2023-05-06 13:29:43 +0800
8ae98006d2 用户详情、修改 lichao 2023-05-06 13:27:12 +0800
52c573be18 ic_property_management表新增联系人，联系电话 yinzuomei 2023-05-06 13:04:35 +0800
d131fd9581 通讯录新增烟台需求字段 lichao 2023-05-06 10:52:52 +0800
3e9799775b resi-group脚本28-29 yinzuomei 2023-05-05 17:59:23 +0800
4aa9e19f0a Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-05-05 17:54:53 +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
b511b7a667 FINISH_SEND_TIME yinzuomei 2023-05-05 14:27:50 +0800
330e2bfc82 /message/organization/message/list;NullPointerException yinzuomei 2023-05-05 14:10:59 +0800
30c353f013 bugfix yinzuomei 2023-05-05 12:27:15 +0800
f8c5ae7324 发送消息 yinzuomei 2023-05-05 10:48:17 +0800
09fc9988fb 保存了内容，还没发消息 yinzuomei 2023-05-04 18:32:22 +0800
208d516403 工作人员缓存增加pid,orgIdPath yinzuomei 2023-05-04 16:49:25 +0800
0b71ba8f79 消息管理未完待续. yinzuomei 2023-05-04 16:32:17 +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
5b69b9843e /resi/partymember/icPartyOrg/editPrincipal接口principalStaffId不必填； yinzuomei 2023-05-04 13:43:57 +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
2e1dfe9277 居民信息列表查询排序调整 yinzuomei 2023-04-28 16:18:44 +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
e76e075c9c 市北反馈社区安全服务列表查询不出来 yinzuomei 2023-04-27 16:28:10 +0800
abfa7fd337 部门导入组织编码文本格式 yinzuomei 2023-04-27 11:17:20 +0800
5802785761 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-27 10:45:14 +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
73d65e2eb9 同一组织下，部门名称唯一 yinzuomei 2023-04-27 09:36:25 +0800
7d21bf38ec 同一组织下，部门名称唯一 yinzuomei 2023-04-26 17:36:09 +0800
0e9c256fd0 部门职责默认为空字符串 yinzuomei 2023-04-26 17:24:23 +0800
2e68db40a9 部门导入，微测试 yinzuomei 2023-04-26 17:09:59 +0800
19f0c74add 部门导入，微测试 yinzuomei 2023-04-26 16:53:42 +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
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
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
de5dc99ba7 fix yinzuomei 2023-04-24 17:54:05 +0800
f4f89692ff 1.统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice wxz 2023-04-24 13:10:35 +0800
53acd4d5fc 1.增加：EpmetUserRemoteService用于获取当前登录用户基础缓存 wxz 2023-04-24 10:49:29 +0800
d856a33edb 1.修改：居民信息导入，只更新已填写的、（意思就是，上次我填了第一列第二列，提交了。这次我只填了第三第四列，第一第二列空着，那这次我导入之后4列都有值，而不是把1，2列更新为空） wxz 2023-04-23 21:15:28 +0800
7b684d485f Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-23 21:01:31 +0800
fcb638285c Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-23 09:06:09 +0800
1e6862f986 烟台：九小场所巡查导入模板名称修改 yinzuomei 2023-04-23 09:03:40 +0800
1cf4e43ee5 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-21 16:44:00 +0800
0e8ac2c547 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-04-21 16:36:04 +0800
eae97f663f 场所类型、场所类别不设置示例 yinzuomei 2023-04-21 16:22:31 +0800
a895977559 规模请正确填写场所人数；模板增加示例 yinzuomei 2023-04-21 16:10:14 +0800
12851dcae5 修复安全生产巡查导入，场所区域为网格名称 yinzuomei 2023-04-21 15:44:56 +0800
b8d818824c 修复安全生产巡查导入，规模必须填入数字。 yinzuomei 2023-04-21 15:14:54 +0800
b39fe4bb2e 修复安全生产巡查，拟复查时间不能置空，且自动带入的问题 yinzuomei 2023-04-21 14:45:27 +0800
8864442f8e 信息采集审核bug修改：暂存一下，要去改别的bug了 yinzuomei 2023-04-21 13:54:25 +0800
3c433bb37a Merge branch 'yantai_zhengwu_master' 曲树通 2023-04-21 10:15:19 +0800
fb1631c6e7 补充曲树通 2023-04-21 09:54:25 +0800
6678154471 社区服务，修改公共服务管理排序规则，依据服务事件倒序； luyan 2023-04-21 09:33:26 +0800
ec093e7c83 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-21 08:54:11 +0800
a76231d092 修改 bug 曲树通 2023-04-20 18:51:39 +0800
20ced141de Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-20 17:05:16 +0800
25b51897bd 不指定泛型 yinzuomei 2023-04-20 17:02:11 +0800
4bc6e5d7dd Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-20 16:48:41 +0800
eb15e0c768 //获取工作人员所属组织同级的党组织改为调用同一方法 yinzuomei 2023-04-20 15:59:14 +0800
b9605d967d 烟台党员画像列表，导出 yinzuomei 2023-04-20 15:52:31 +0800
a80f024c3f 烟台党员画像列表返参dto回归正常位置 yinzuomei 2023-04-20 14:06:03 +0800
cda40ad9d5 调整王童的方法 yinzuomei 2023-04-20 14:03:08 +0800
1f675bf4c4 居民画像列表学历sql判断写死 yinzuomei 2023-04-20 12:30:06 +0800
6ea9f03415 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-20 09:05:34 +0800
46afd543f1 柱状图，点击曲线，查看街道 yinzuomei 2023-04-19 18:57:02 +0800
ec0ab04170 居民画像导出 yinzuomei 2023-04-19 17:48:17 +0800
44e024a77a 居民画像导出 yinzuomei 2023-04-19 17:46:32 +0800
c4f6cbfe44 居民画像返回总数 yinzuomei 2023-04-19 17:39:28 +0800
a05d9a03dd Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-19 14:52:19 +0800
7caf2b33f3 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:46:57 +0800
99e245dee8 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:33:43 +0800
e476725b24 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:31:17 +0800
c31da6b351 房屋数统一 lichao 2023-04-19 10:37:28 +0800
28425ade48 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-19 09:10:29 +0800

Commit Graph Select branches Hide Pull Requests dev master Mono Color

Commit Graph

Select branches

Hide Pull Requests

dev

master