Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.5__activity.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `epmet_heart`.`act_info`
+    ADD COLUMN `ACT_TYPE` varchar(10) NULL COMMENT '活动类型 爱心活动heart 联建活动party' AFTER `CUSTOMER_ID`,
+    ADD COLUMN `UNIT_ID` varchar(64) NULL COMMENT '联建单位ID' AFTER `ACT_TYPE`,
+    ADD COLUMN `SERVICE_MATTER` varchar(64) NULL COMMENT '服务事项' AFTER `UNIT_ID`,
+    ADD COLUMN `TARGET` varchar(100) NULL COMMENT '活动目标' AFTER `TITLE`;
+
+
+ALTER TABLE `epmet_heart`.`ic_party_activity`
+    ADD COLUMN `ACT_ID` varchar(64) NULL COMMENT 'act_info表ID' AFTER `PIDS`;

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -346,7 +346,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
                 entity.setResiEventId(resiEventEntity.getId());
                 entity.setAttachmentName(file.getName());
                 entity.setAttachmentFormat(file.getFormat());
-                entity.setAttachmentType(file.getType());
+                entity.setAttachmentType("voice");
                 entity.setAttachmentUrl(file.getUrl());
                 entity.setSort(sort);
                 entity.setStatus(TopicConstant.AUDITING);