From 7e07ce167ae4d98c532c6074adcb65c13e67376e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 21 Oct 2024 16:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=9E=8D=E5=90=88-=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 202410/机具大融合/20241017_material_full.sql        | 3 +++
 202410/机具大融合/20241021_bm_file_info新增字段.sql | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 202410/机具大融合/20241021_bm_file_info新增字段.sql

diff --git a/202410/机具大融合/20241017_material_full.sql b/202410/机具大融合/20241017_material_full.sql
index f139882..1e719a2 100644
--- a/202410/机具大融合/20241017_material_full.sql
+++ b/202410/机具大融合/20241017_material_full.sql
@@ -150,6 +150,7 @@ CREATE TABLE `bm_config`  (
 DROP TABLE IF EXISTS `bm_file_info`;
 CREATE TABLE `bm_file_info`  (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `task_id` bigint(20) NULL DEFAULT NULL COMMENT '任务id',
   `model_id` int(11) NULL DEFAULT NULL COMMENT '模块id',
   `file_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称',
   `file_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件路径',
@@ -608,6 +609,8 @@ CREATE TABLE `ma_machine`  (
   `inspect_man` varchar(90) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检验人员',
   `inspect_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检验结论',
   `phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `assets_id` bigint(20) NULL DEFAULT NULL COMMENT '资产属性id（用于维护资产属性列表）',
+  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`ma_id`) USING BTREE,
   UNIQUE INDEX `unique_index_typeid_macode`(`type_id`, `ma_code`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '机具设备管理ma_machine' ROW_FORMAT = DYNAMIC;
diff --git a/202410/机具大融合/20241021_bm_file_info新增字段.sql b/202410/机具大融合/20241021_bm_file_info新增字段.sql
new file mode 100644
index 0000000..9082e85
--- /dev/null
+++ b/202410/机具大融合/20241021_bm_file_info新增字段.sql
@@ -0,0 +1,3 @@
+-- 任务id
+alter table bm_file_info
+    add task_id bigint null comment '任务id';