diff --git a/202410/机具大融合/20241017_material_full.sql b/202410/机具大融合/20241017_material_full.sql
index 0d32448..0caddd1 100644
--- a/202410/机具大融合/20241017_material_full.sql
+++ b/202410/机具大融合/20241017_material_full.sql
@@ -118,16 +118,16 @@ CREATE TABLE `bm_agreement_info`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `bm_asset_attributes`;
 CREATE TABLE `bm_asset_attributes`  (
-  `id` bigint(20) NOT NULL COMMENT '主键id',
-  `asset_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资产类型名称',
-  `asset_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资产编码',
-  `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）',
-  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '资产属性表' ROW_FORMAT = Dynamic;
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+    `asset_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资产类型名称',
+    `asset_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资产编码',
+    `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）',
+    `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '资产属性表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for bm_config
@@ -661,24 +661,25 @@ CREATE TABLE `ma_part_repair`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `ma_part_type`;
 CREATE TABLE `ma_part_type`  (
-  `pa_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '类型ID',
-  `pa_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型名称',
-  `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上级ID',
-  `status` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
-  `storage_num` int(11) NULL DEFAULT 0 COMMENT '实时库存',
-  `unit_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计量单位ID',
-  `buy_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '原值',
-  `level` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '层级',
-  `warn_num` int(11) NULL DEFAULT 0 COMMENT '库存预警数量',
-  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `company_id` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据所属组织',
-  `year` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '框架年份',
-  PRIMARY KEY (`pa_id`) USING BTREE
+     `pa_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '类型ID',
+     `pa_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型名称',
+     `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上级ID',
+     `status` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
+     `storage_num` int(11) NULL DEFAULT 0 COMMENT '实时库存',
+     `unit_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计量单位ID',
+     `unit_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计量单位名称',
+     `buy_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '原值',
+     `level` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '层级',
+     `warn_num` int(11) NULL DEFAULT 0 COMMENT '库存预警数量',
+     `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+     `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+     `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+     `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+     `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+     `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+     `company_id` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据所属组织',
+     `year` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '框架年份',
+     PRIMARY KEY (`pa_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配件类型管理ma_part_type' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
@@ -756,6 +757,7 @@ CREATE TABLE `ma_type`  (
   `type_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型编号',
   `model_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规格编号',
   `unit_id` int(11) NULL DEFAULT NULL COMMENT '计量单位ID',
+  `unit_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计量单位名称',
   `manage_type` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '管理方式(0编号 1计数)',
   `lease_price` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '内部租赁单价',
   `eff_time` datetime NULL DEFAULT NULL COMMENT '租赁费用生效时间',
@@ -1524,6 +1526,26 @@ CREATE TABLE `tm_task_agreement`  (
   PRIMARY KEY (`task_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '任务表tm_task_agreement' ROW_FORMAT = DYNAMIC;
 
+
+-- ----------------------------
+-- Table structure for tm_task_audit_log
+-- ----------------------------
+DROP TABLE IF EXISTS `tm_task_audit_log`;
+CREATE TABLE `tm_task_audit_log`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `task_id` bigint(20) NOT NULL COMMENT '任务ID',
+  `task_type` int(11) NULL DEFAULT NULL COMMENT '任务类型(定义数据字典)',
+  `role_key` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色权限字符串',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '任务表tm_task' ROW_FORMAT = DYNAMIC;
+
+
+
 -- ----------------------------
 -- Table structure for tm_task_storage_analyze
 -- ----------------------------
diff --git a/202410/机具大融合/20241016_ma_part_type表增加字段.sql b/202410/机具大融合/20241017零散备份/20241016_ma_part_type表增加字段.sql
similarity index 100%
rename from 202410/机具大融合/20241016_ma_part_type表增加字段.sql
rename to 202410/机具大融合/20241017零散备份/20241016_ma_part_type表增加字段.sql
diff --git a/202410/机具大融合/20241018_tm_task_audit_log.sql b/202410/机具大融合/20241018_tm_task_audit_log.sql
new file mode 100644
index 0000000..0ade034
--- /dev/null
+++ b/202410/机具大融合/20241018_tm_task_audit_log.sql
@@ -0,0 +1,37 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost-57
+ Source Server Type    : MySQL
+ Source Server Version : 50743
+ Source Host           : localhost:3306
+ Source Schema         : bns_cloud_material
+
+ Target Server Type    : MySQL
+ Target Server Version : 50743
+ File Encoding         : 65001
+
+ Date: 18/10/2024 12:24:06
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for tm_task_audit_log
+-- ----------------------------
+DROP TABLE IF EXISTS `tm_task_audit_log`;
+CREATE TABLE `tm_task_audit_log`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `task_id` bigint(20) NOT NULL COMMENT '任务ID',
+  `task_type` int(11) NULL DEFAULT NULL COMMENT '任务类型(定义数据字典)',
+  `role_key` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色权限字符串',
+  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '任务表tm_task' ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;