From 757a5a1373c96d216be9eb5d6b5cd6374ce95deb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 14:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskPathTemplateMerge.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskPathTemplateMerge.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskPathTemplateMerge.java
index f5b1b18..cdfc643 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskPathTemplateMerge.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskPathTemplateMerge.java
@@ -183,6 +183,20 @@
@TableLogic
private Long deleted;
+ /**
+ * 鏉′欢琛ㄨ揪寮�(JSON)锛岃捣鐐圭被鍨�/璧风偣绯荤粺鏍囪瘑/鍓嶇鐢�
+ */
+ @ApiModelProperty(value = "鏉′欢琛ㄨ揪寮�(JSON)锛岃捣鐐圭被鍨�/璧风偣绯荤粺鏍囪瘑/鍓嶇鐢�")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> sourceTypeR;
+
+ /**
+ * 鏉′欢琛ㄨ揪寮�(JSON)锛岃捣鐐圭被鍨�/璧风偣绯荤粺鏍囪瘑/鍓嶇鐢�
+ */
+ @ApiModelProperty(value = "鏉′欢琛ㄨ揪寮�(JSON)锛岃捣鐐圭被鍨�/璧风偣绯荤粺鏍囪瘑/鍓嶇鐢�")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> targetTypeR;
+
public TaskPathTemplateMerge() {}
public String getEffectiveTime$(){
--
Gitblit v1.9.1