Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.23__resi_event.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily`
+    MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源 来源：议题issue 组织agency，事件resi_event' AFTER `PIDS`,
+    MODIFY COLUMN `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源ID:议题id ;or组织id，事件ID' AFTER `ORIGIN`;

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.16__create_resievent_tables.sql

@@ -125,4 +125,8 @@ CREATE TABLE `resi_event_operation_log` (
   `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='事件操作日志表';
+
+
+ALTER TABLE `project`
+    MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue  项目立项:agency 事件:resi_event' AFTER `AGENCY_ID`;