From 912b4dab5f847ab1108b18df1b5e06e85c71881e Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/i18n/en.js |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index ce9f2cb..a5aa5f4 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -224,9 +224,28 @@
         taskPathTemplateNode: 'TaskPathTemplateNode',
         subsystemFlowTemplate: 'SubsystemFlowTemplate',
         flowStepTemplate: 'FlowStepTemplate',
+        taskPathTemplateMerge: 'TaskPathTemplateMerge',
     },
     table: {
         field: {
+            taskPathTemplateMerge: {
+                templateCode: "templateCode",
+                templateName: "templateName",
+                sourceType: "sourceType",
+                targetType: "targetType",
+                conditionExpression: "conditionExpression",
+                conditionDesc: "conditionDesc",
+                version: "version",
+                isCurrent: "isCurrent",
+                effectiveTime: "effectiveTime",
+                expireTime: "expireTime",
+                priority: "priority",
+                timeoutMinutes: "timeoutMinutes",
+                maxRetryTimes: "maxRetryTimes",
+                retryIntervalSeconds: "retryIntervalSeconds",
+                remark: "remark",
+                stepSize: "stepSize",
+            },
             flowStepTemplate: {
                 flowId: "flowId",
                 flowCode: "flowCode",

--
Gitblit v1.9.1