From f7c904f2b079d903d7811b8aad6429f5307c60f6 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 04 二月 2026 15:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 13 +++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index bceb7c9..2509fba 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -82,6 +82,19 @@
@ApiModelProperty(value= "鐩爣搴撲綅")
private String targLoc;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty("婧愮珯鐐�")
+ private String orgSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty("鐩爣绔欑偣")
+ private String targSite;
+
/**
* 鎵樼洏鐮�
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 955acba..c7e18e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -829,7 +829,9 @@
TaskLog taskLog = new TaskLog();
BeanUtils.copyProperties(task, taskLog);
taskLog.setOrgLoc(task.getOrgLoc())
- .setTargLoc(task.getTargLoc());
+ .setTargLoc(task.getTargLoc())
+ .setTargSite(task.getTargSite())
+ .setOrgSite(task.getOrgSite());
taskLog.setTaskId(task.getId())
.setId(null);
if (!taskLogService.save(taskLog)) {
--
Gitblit v1.9.1