From be2859960760faba464969ee01da1e1984d10793 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 二月 2026 15:37:46 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
index 769ca22..624cc6d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -66,7 +66,7 @@
         for (String sourceType : sourceTypeR) {
             for (String targetType : targetTypeR) {
                 TaskPathTemplateMerge taskPathTemplateMerge = new TaskPathTemplateMerge();
-                taskPathTemplateMerge.setConditionDesc(taskPathTemplateMerge.getConditionDesc());
+                taskPathTemplateMerge.setConditionExpression(taskPathTemplateMerges.getConditionExpression());
                 taskPathTemplateMerge.setSourceType(sourceType);
                 taskPathTemplateMerge.setTargetType(targetType);
                 taskPathTemplateMerge.setCreateBy(getLoginUserId());

--
Gitblit v1.9.1