Merge branch 'dev_ic_mp' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -63,7 +63,7 @@ spring:
     password: @datasource.druid.password@
     baseline-on-migrate: true
     baseline-version: 0
-
+    validate-on-migrate: false
 management:
   endpoints:
     web:

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

@@ -6,11 +6,4 @@ ALTER TABLE `epmet_heart`.`act_info`
 
 
 ALTER TABLE `epmet_heart`.`ic_party_activity`
-    ADD COLUMN `ACT_ID` varchar(64) NULL COMMENT 'act_info表ID' AFTER `PIDS`;
-
-
-ALTER TABLE `epmet_heart`.`latest_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`;
+    ADD COLUMN `ACT_ID` varchar(64) NULL COMMENT 'act_info表ID' AFTER `PIDS`;

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

@@ -0,0 +1,5 @@
+ALTER TABLE `epmet_heart`.`latest_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`;