diff --git a/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java b/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java
index 8d48e3f85244a17c515cad37220d9dc4bf66c12b..fe37081b8d4e96ef9529d11a00d81a0272acace1 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java
@@ -161,9 +161,21 @@ public class ExportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
         }
         {
             // 工单表单数据
-            String sql = "SELECT * FROM `processtask_formattribute_data` WHERE `processtask_id` = " + processTaskId;
-            List<Map<String, Object>> processtask_formattribute_data = processTaskDataMapper.getList(sql);
-            put(resultObj, "processtask_formattribute_data", processtask_formattribute_data);
+            String sql = "SELECT * FROM `processtask_formattribute` WHERE `processtask_id` = " + processTaskId;
+            List<Map<String, Object>> processtask_formattribute = processTaskDataMapper.getList(sql);
+            put(resultObj, "processtask_formattribute", processtask_formattribute);
+
+            sql = "SELECT * FROM `processtask_extend_formattribute` WHERE `processtask_id` = " + processTaskId;
+            List<Map<String, Object>> processtask_extend_formattribute = processTaskDataMapper.getList(sql);
+            put(resultObj, "processtask_extend_formattribute", processtask_extend_formattribute);
+
+            sql = "SELECT a.* FROM `form_attribute_data` a JOIN `processtask_formattribute` b ON b.`form_attribute_data_id` = a.`id` WHERE b.`processtask_id` = " + processTaskId;
+            List<Map<String, Object>> form_attribute_data = processTaskDataMapper.getList(sql);
+            put(resultObj, "form_attribute_data", form_attribute_data);
+
+            sql = "SELECT a.* FROM `form_extend_attribute_data` a JOIN `processtask_extend_formattribute` b ON b.`form_attribute_data_id` = a.`id` WHERE b.`processtask_id` = " + processTaskId;
+            List<Map<String, Object>> form_extend_attribute_data = processTaskDataMapper.getList(sql);
+            put(resultObj, "form_extend_attribute_data", form_extend_attribute_data);
         }
         {
             // 工单关联
@@ -391,12 +403,6 @@ public class ExportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
                 put(resultObj, "event_solution", event_solution);
             }
         }
-        {
-            // 步骤表单权限
-            String sql = "SELECT * FROM `processtask_step_formattribute` WHERE `processtask_id` = " + processTaskId;
-            List<Map<String, Object>> processtask_step_formattribute = processTaskDataMapper.getList(sql);
-            put(resultObj, "processtask_step_formattribute", processtask_step_formattribute);
-        }
         {
             // 正在后台进行处理操作的步骤列表
             String sql = "SELECT * FROM `processtask_step_in_operation` WHERE `processtask_id` = " + processTaskId;
diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java
index 2f1dd763cc2f7014008b77094964b96b0693fc6d..64768c8a3d1c4eff50194366d1a95be32c37a075 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java
@@ -123,7 +123,7 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase {
         for (ProcessTaskRelationVo relation : relationList) {
             taskMapper.deleteProcessTaskRelationById(relation.getId());
         }
-        // 表单 processtask_form processtask_formattribute_data
+        // 表单 processtask_form processtask_formattribute processtask_extend_formattribute form_attribute_data form_extend_attribute_data
         taskMapper.deleteProcessTaskFormByProcessTaskId(processTaskId);
         processTaskService.deleteProcessTaskFormAttributeDataByProcessTaskId(processTaskId);
         // 关注人 processtask_focus
@@ -139,7 +139,7 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase {
         // processtask_step_remind
         // processtask_step processtask_step_agent processtask_step_notify_policy processtask_step_comment
         // processtask_step_content
-        // processtask_step_data processtask_step_formattribute processtask_step_sla
+        // processtask_step_data processtask_step_sla
         // processtask_step_rel
         // processtask_step_timeaudit processtask_step_timeout_policy
         // processtask_step_worker_policy
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
index a83f6eaed4828ee22f761d6c4971fdeda1feab36..eeb5d14d54895a32a41d9538e745508d483c7de2 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml
@@ -118,33 +118,6 @@
 		LEFT JOIN `process_step_worker_policy` h ON a.`uuid` = h.`process_step_uuid`
 		WHERE a.`process_uuid` = #{value}
 	</select>
-	<!--<select id="getProcessStepDetailByProcessUuid" parameterType="java.lang.String" resultMap="processStepDetailMap">
-		SELECT
-		a.`process_uuid` AS processUuid,
-		a.`uuid`,
-		a.`name`,
-		a.`type`,
-		a.`handler`,
-		a.`config` AS stepConfig,
-		b.`form_uuid` AS formUuid,
-		b.`attribute_uuid` AS formAttributeUuid,
-		b.`action` AS action,
-		b.`type` AS actionType,
-		c.`handler` AS formAttributeHandler,
-		c.`type` AS formAttributeType,
-		c.`label` AS attributeLabel,
-		h.`policy` AS workerPolicy,
-		h.`sort` AS workerPolicySort,
-		h.`config` AS workerPolicyConfig,
-		h.`process_uuid` AS workerPolicyProcessUuid,
-		h.`process_step_uuid` AS workerPolicyProcessStepUuid
-		FROM
-		`process_step` a
-		LEFT JOIN `process_step_formattribute` b ON a.`uuid` = b.`process_step_uuid` and a.`process_uuid` = b.`process_uuid`
-		LEFT JOIN `form_attribute` c ON b.`attribute_uuid` = c.`uuid`
-		LEFT JOIN `process_step_worker_policy` h ON a.`uuid` = h.`process_step_uuid`
-		WHERE a.`process_uuid` = #{value}
-	</select>-->
 
 	<select id="getProcessStepUuidListByProcessUuid" parameterType="java.lang.String" resultType="java.lang.String">
 		SELECT `uuid` FROM `process_step` WHERE `process_uuid` = #{value}
@@ -554,26 +527,6 @@
 		)
 	</insert>
 
-	<!--<insert id="insertProcessStepFormAttribute" parameterType="neatlogic.framework.process.dto.ProcessStepFormAttributeVo">
-		INSERT INTO `process_step_formattribute` (
-		`process_uuid`,
-		`process_step_uuid`,
-		`form_uuid`,
-		`attribute_uuid`,
-		`action`,
-		`type`
-		)
-		VALUES
-		(
-		#{processUuid},
-		#{processStepUuid},
-		#{formUuid},
-		#{attributeUuid},
-		#{action},
-		#{type}
-		)
-	</insert>-->
-
 	<insert id="insertProcessStepRel" parameterType="neatlogic.framework.process.dto.ProcessStepRelVo">
 		INSERT INTO `process_step_rel` (
 		`process_uuid`,
@@ -711,13 +664,6 @@
 		WHERE process_uuid = #{value}
 	</delete>
 
-	<!--<delete id="deleteProcessStepFormAttributeByProcessUuid" parameterType="java.lang.String">
-		DELETE
-		FROM
-		`process_step_formattribute`
-		WHERE `process_uuid` = #{value}
-	</delete>-->
-
 	<delete id="deleteProcessByUuid" parameterType="java.lang.String">
 		DELETE FROM `process` WHERE `uuid` = #{uuid}
 	</delete>
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
index cd2dd3f4b4a3833820510e20134d5c94574f84c3..edcbc59373cbb9f66de24789cc8170806977604a 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
@@ -3348,20 +3348,6 @@
         VALUES (#{hash}, #{config})
     </insert>
 
-    <!--<insert id="insertProcessTaskStepFormAttribute"
-            parameterType="neatlogic.framework.process.dto.ProcessTaskStepFormAttributeVo">
-        INSERT INTO `processtask_step_formattribute` (`processtask_id`,
-                                                      `processtask_step_id`,
-                                                      `attribute_uuid`,
-                                                      `action`,
-                                                      `type`)
-        VALUES (#{processTaskId},
-                #{processTaskStepId},
-                #{attributeUuid},
-                #{action},
-                #{type})
-    </insert>-->
-
     <insert id="insertIgnoreProcessTaskConfig" parameterType="neatlogic.framework.process.dto.ProcessTaskConfigVo">
         INSERT IGNORE INTO `processtask_config` (`hash`, `config`)
         VALUES (#{hash}, #{config})
diff --git a/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/neatlogic_tenant.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d75433546cde7f6a63e09eac0cd16e9a5ccb1720
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/neatlogic_tenant.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS `processtask_formattribute_data`;
+DROP TABLE IF EXISTS `processtask_form_extend_attribute`;
+DROP TABLE IF EXISTS `process_step_formattribute`;
+DROP TABLE IF EXISTS `processtask_step_formattribute`;
diff --git a/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/version.json b/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/version.json
new file mode 100644
index 0000000000000000000000000000000000000000..ae1a7deaaca0d5b6a917a0f6367609bfbfd49db8
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/process/changelog/2024-05-16/version.json
@@ -0,0 +1,10 @@
+{
+  "content":[
+    {
+      "type":"新增功能",
+      "detail":[
+        {"msg":"1.删除数据库四张与工单表单相关的废弃表"}
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
index fc38f644ce325e554c2fe706c533a6b1f2c5c484..aef1e53962e802c6fbb263f480ecfdd6f83d80e9 100644
--- a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
+++ b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql
@@ -163,19 +163,6 @@ CREATE TABLE IF NOT EXISTS `process_step_comment_template` (
   PRIMARY KEY (`process_step_uuid`,`comment_template_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程步骤-回复模版关联表';
 
--- ----------------------------
--- Table structure for process_step_formattribute
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `process_step_formattribute` (
-  `process_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程uuid',
-  `process_step_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '步骤uuid',
-  `form_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单uuid',
-  `attribute_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid',
-  `action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '授权类型',
-  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型',
-  PRIMARY KEY (`process_uuid`,`process_step_uuid`,`form_uuid`,`attribute_uuid`,`action`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程步骤表单组件授权表';
-
 -- ----------------------------
 -- Table structure for process_step_handler
 -- ----------------------------
@@ -894,18 +881,6 @@ CREATE TABLE IF NOT EXISTS `processtask_step_event` (
   UNIQUE KEY `idx_event_id` (`event_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单步骤-事件关联表';
 
--- ----------------------------
--- Table structure for processtask_step_formattribute
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `processtask_step_formattribute` (
-  `processtask_id` bigint NOT NULL COMMENT '工单id',
-  `processtask_step_id` bigint NOT NULL COMMENT '工单步骤id',
-  `attribute_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid',
-  `action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '授权类型',
-  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型',
-  PRIMARY KEY (`processtask_id`,`processtask_step_id`,`attribute_uuid`,`action`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工单步骤可查看的表单属性';
-
 -- ----------------------------
 -- Table structure for processtask_step_in_operation
 -- ----------------------------