From 2ce6327ec49e7fe73cc1cd3bcc2b63b28d89d38f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:05:25 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..cff621a 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
@@ -16,7 +16,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -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());
@@ -130,3 +130,4 @@
}
}
+
--
Gitblit v1.9.1