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

dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -354,23 +354,23 @@ CREATE TABLE IF NOT EXISTS `dt_define_info_collect` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='信息点交付配置表';
 
-CREATE TABLE IF NOT EXISTS "dt_define_relation_collect" (
-  "id" varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  "group_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
-  "project_id" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目ID',
-  "delivery_type" tinyint DEFAULT NULL COMMENT '交付类型：0-项目交付 1-现场交付',
-  "graph_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图类型编码',
-  "rel_code" varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '边类型编码',
-  "source_type_codes" json DEFAULT NULL COMMENT '源端对象类型编码',
-  "end_type_codes" json DEFAULT NULL COMMENT '末端对象类型编码',
-  "automatic_flag" tinyint(1) DEFAULT NULL COMMENT '计算方式：0-手动计算 1-自动计算',
-  "pipe_use" text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '管道用途',
-  "remark" text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '备注',
-  "creator" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
-  "creation_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
-  "modifier" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
-  "modified_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
-  "valid" tinyint DEFAULT '1' COMMENT '合法标识',
-  "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
-  PRIMARY KEY ("id") USING BTREE
+CREATE TABLE IF NOT EXISTS `dt_define_relation_collect` (
+  `id` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `group_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '集团编码',
+  `project_id` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目ID',
+  `delivery_type` tinyint DEFAULT NULL COMMENT '交付类型：0-项目交付 1-现场交付',
+  `graph_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图类型编码',
+  `rel_code` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '边类型编码',
+  `source_type_codes` json DEFAULT NULL COMMENT '源端对象类型编码',
+  `end_type_codes` json DEFAULT NULL COMMENT '末端对象类型编码',
+  `automatic_flag` tinyint(1) DEFAULT NULL COMMENT '计算方式：0-手动计算 1-自动计算',
+  `pipe_use` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '管道用途',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '备注',
+  `creator` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+  `creation_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+  `modified_time` char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改时间',
+  `valid` tinyint DEFAULT '1' COMMENT '合法标识',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '乐观锁',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;