Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9329e013a7 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 16:23:44 +0800
• de31cf49e5 updateArticle yinzuomei 2023-04-24 16:21:18 +0800
• 068e6e35d9 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 16:17:56 +0800
• 97c11ef229 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-24 16:15:54 +0800
• 200527744c updateArticle yinzuomei 2023-04-24 16:15:02 +0800
• d513516d5c Merge branch 'lingshan_master' into dev wxz 2023-04-24 16:02:28 +0800
• b8136cbb6f fix wxz 2023-04-24 16:00:20 +0800
• 8a10311285 Merge branch 'lingshan_master' into dev wxz 2023-04-24 15:53:28 +0800
• 7d1272c54e Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-24 15:53:16 +0800
• 8fadcea4d4 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-24 15:45:28 +0800
• c0bd3b7549 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 15:44:16 +0800
• a3ed8c0350 fix:【灵山-特殊人群】修改接口，修复类别变更，忘记删除旧类别的bug wxz 2023-04-24 15:43:02 +0800
• 6284baa3d2 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-24 15:42:04 +0800
• fe0536f36b updateArticle yinzuomei 2023-04-24 15:41:13 +0800
• 96b8a4bccc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-24 15:22:01 +0800
• f88ac1630d fix wxz 2023-04-24 15:21:40 +0800
• d9326a8afd Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 15:18:57 +0800
• 580e64ce9a /gov/voice/draft/detailV2区分内容和附件 yinzuomei 2023-04-24 15:16:14 +0800
• 5c933863b4 /gov/voice/article/detailV2区分内容和附件 yinzuomei 2023-04-24 15:14:05 +0800
• 906d12e118 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 15:06:27 +0800
• fd32302b60 所属栏目不能为空 暂时注释 yinzuomei 2023-04-24 15:02:45 +0800
• 2f79e175e6 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-24 15:00:31 +0800
• 09e20f709d 党建声音发布支持上传文件 yinzuomei 2023-04-24 14:59:51 +0800
• 8af03f655a 1.修改：【灵山大屏-党建宣传】列表-增加category参数，传递一级栏目id，查询该栏目下的文章。2.修改：【灵山大屏】文章详情，增加categroy和categoryName的返回 wxz 2023-04-24 14:44:20 +0800
• 58eff6d6d0 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-24 13:43:58 +0800
• e0c8a124a6 Merge branch 'lingshan_master' into dev wxz 2023-04-24 13:41:29 +0800
• 0b99c1e16b Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-24 13:41:15 +0800
• 758c77c7cf 1.fix wxz 2023-04-24 13:40:08 +0800
• 9bbb469749 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-24 13:19:12 +0800
• 537ef0c4cc Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-24 13:18:44 +0800
• f4f89692ff 1.统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice wxz 2023-04-24 13:10:35 +0800
• 37b36f9d48 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 12:50:41 +0800
• d8c4752ea6 列表 yinzuomei 2023-04-24 12:38:26 +0800
• 25ce4f1c41 特殊人群类别调整，使用新的类别 wxz 2023-04-24 11:23:39 +0800
• 606b43f809 安全负责人！ yinzuomei 2023-04-24 11:14:07 +0800
• d23590d632 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet/epmet-cloud-lingshan wxz 2023-04-24 11:14:02 +0800
• e35e4b14b0 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 11:06:21 +0800
• 0f936dc05f Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-24 11:00:34 +0800
• e650c3cedc /gov/org/customeragency/agencygridtreeV2 yinzuomei 2023-04-24 10:59:51 +0800
• fa90ba0d7f Merge branch 'lingshan_master' into dev wxz 2023-04-24 10:57:48 +0800
• 0c5c4cd98f 1.修改：兼容老的人群类型 wxz 2023-04-24 10:55:41 +0800
• 7ae4a5199c Merge branch 'master' into lingshan_master wxz 2023-04-24 10:51:41 +0800
• 53acd4d5fc 1.增加：EpmetUserRemoteService用于获取当前登录用户基础缓存 wxz 2023-04-24 10:49:29 +0800
• 1bd715bab0 Merge branch 'lingshan_master' into dev wxz 2023-04-24 10:26:36 +0800
• 885aeea8d6 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-24 10:26:17 +0800
• b5b9704c71 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-24 10:24:38 +0800
• 128f20c00e 1.修改：特殊人群跟居民信息里的特殊人群挂钩。2：修复：下载的时候下载的xls而不是xlsx wxz 2023-04-24 10:24:14 +0800
• 9f01253363 Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-24 10:03:09 +0800
• 8983c14465 test yinzuomei 2023-04-24 09:48:51 +0800
• 9e7849c07b Merge remote-tracking branch 'origin/dev' into dev wxz 2023-04-23 21:20:00 +0800
• 48dae94d89 Merge branch 'wxz_resiinfo_import_fix' into dev wxz 2023-04-23 21:18:53 +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
• 74f085ba7a Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-23 18:13:43 +0800
• a3d574ee0b try yinzuomei 2023-04-23 18:10:09 +0800
• e75c12e0df try yinzuomei 2023-04-23 17:38:48 +0800
• 2c2d2871da Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-23 17:16:40 +0800
• a280d216cc Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-23 16:39:41 +0800
• 0f72b76376 企业的所属组织，可以是网格，可以是社区，可以是街道.... yinzuomei 2023-04-23 16:39:08 +0800
• 89e04c670f Merge branch 'lingshan_master' into dev wxz 2023-04-23 16:29:49 +0800
• bdf2eb1812 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-23 16:27:55 +0800
• ff79f02ef8 1.fix：特殊人群，调整， wxz 2023-04-23 16:27:28 +0800
• 94392b0399 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master yinzuomei 2023-04-23 16:09:31 +0800
• f550f1fcb9 导入没改完，需求变了 yinzuomei 2023-04-23 16:09:04 +0800
• fac408bfa3 Merge branch 'lingshan_master' into dev wxz 2023-04-23 15:56:28 +0800
• ccd8da706e Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-23 15:56:19 +0800
• e5ba6a44fa Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-23 15:53:55 +0800
• 2c716ada8a 1.修改：特殊人群，调整，直接关联居民信息。 wxz 2023-04-23 15:53:28 +0800
• 9f1833d9bb 灵山企业档案=原产品重点危化品企业；导出，导入模板调整 yinzuomei 2023-04-23 15:13:43 +0800
• 56dacf760c Merge remote-tracking branch 'origin/lingshan_master' into dev yinzuomei 2023-04-23 14:58:23 +0800
• 7ddf1d66ac 灵山企业档案=原产品重点危化品企业 yinzuomei 2023-04-23 14:56:46 +0800
• 93e9ef9249 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-23 09:05:48 +0800
• 1e6862f986 烟台：九小场所巡查导入模板名称修改 yinzuomei 2023-04-23 09:03:40 +0800
• ade30d50cd Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into lingshan_master yinzuomei 2023-04-21 17:39:59 +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
• 20ddd2fe19 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 16:23:52 +0800
• eae97f663f 场所类型、场所类别不设置示例 yinzuomei 2023-04-21 16:22:31 +0800
• 2126aa840e Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 16:12:35 +0800
• a895977559 规模请正确填写场所人数；模板增加示例 yinzuomei 2023-04-21 16:10:14 +0800
• 6ad50d51aa Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 15:46:15 +0800
• 12851dcae5 修复安全生产巡查导入，场所区域为网格名称 yinzuomei 2023-04-21 15:44:56 +0800
• b7fb7405b0 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 15:19:03 +0800
• b8d818824c 修复安全生产巡查导入，规模必须填入数字。 yinzuomei 2023-04-21 15:14:54 +0800
• 4289a2037c Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 14:47:04 +0800
• b39fe4bb2e 修复安全生产巡查，拟复查时间不能置空，且自动带入的问题 yinzuomei 2023-04-21 14:45:27 +0800
• 0327b88f73 Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev yinzuomei 2023-04-21 14:09:13 +0800
• 8864442f8e 信息采集审核bug修改：暂存一下，要去改别的bug了 yinzuomei 2023-04-21 13:54:25 +0800
• d36d9869a2 Merge branch 'lingshan_master' into dev wxz 2023-04-21 10:31:49 +0800
• ce07c59ef0 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-21 10:31:42 +0800
• 3114ebb219 1.新增：特殊人员导入模板下载 wxz 2023-04-21 10:29:01 +0800
• 7317f66838 Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-21 09:57:33 +0800
• 810a1d3fce Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-21 09:56:23 +0800
• fb1631c6e7 补充 曲树通 2023-04-21 09:54:25 +0800
• 30d879068d 1.新增：删除特殊人员信息。2.将创建接口，改为保存接口，同时支持创建和修改 wxz 2023-04-21 09:51:21 +0800
• 5ecc91771f 1.新增：删除特殊人员信息。2.将创建接口，改为保存接口，同时支持创建和修改 wxz 2023-04-21 09:51:15 +0800
• 6678154471 社区服务，修改公共服务管理排序规则，依据服务事件倒序； luyan 2023-04-21 09:33:26 +0800
• c11afec4bd 调整 wxz 2023-04-20 23:11:02 +0800
• 7575c928b8 1.新增：特殊人群-新增。2.新增：特殊人群详情。3.新增：特殊人群详情 wxz 2023-04-20 22:36:26 +0800
• 2545939f54 Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-20 18:55:01 +0800
• a76231d092 修改 bug 曲树通 2023-04-20 18:51:39 +0800