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/zh.js | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 961e62b..c540b65 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -240,9 +240,28 @@
taskPathTemplateNode: '浠诲姟璺緞妯℃澘鑺傜偣',
subsystemFlowTemplate: '瀛愮郴缁熸祦绋嬫ā鏉�',
flowStepTemplate: '娴佺▼姝ラ妯℃澘',
+ taskPathTemplateMerge: '浠诲姟璺緞妯℃澘鍚堝苟',
},
table: {
field: {
+ taskPathTemplateMerge: {
+ templateCode: "妯℃澘缂栫爜",
+ templateName: "妯℃澘鍚嶇О",
+ sourceType: "婧愮被鍨�",
+ targetType: "鐩爣绫诲瀷",
+ conditionExpression: "鏉′欢琛ㄨ揪寮�",
+ conditionDesc: "鏉′欢鎻忚堪",
+ version: "鐗堟湰",
+ isCurrent: "鏄惁褰撳墠",
+ effectiveTime: "鐢熸晥鏃堕棿",
+ expireTime: "杩囨湡鏃堕棿",
+ priority: "浼樺厛绾�",
+ timeoutMinutes: "瓒呮椂鏃堕棿",
+ maxRetryTimes: "鏈�澶ч噸璇曟鏁�",
+ retryIntervalSeconds: "閲嶈瘯闂撮殧",
+ remark: "澶囨敞",
+ stepSize: "姝ラ暱",
+ },
flowStepTemplate: {
flowId: "娴佺▼ID",
flowCode: "娴佺▼缂栫爜",
--
Gitblit v1.9.1