From d85c814b146f5186d4d651e3e8fbb79dc1050fd2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
index 7d3907d..24eac7d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwTaskScheduleVO.java
@@ -20,6 +20,9 @@
import lombok.Data;
import java.util.Date;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 任务调度记录表 视图实体类
@@ -28,9 +31,10 @@
* @since 2026-01-08
*/
@Data
-public class FwTaskScheduleVO {
+public class FwTaskScheduleVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 设备ID（ja_fw_device.id）
@@ -47,6 +51,11 @@
*/
@ApiModelProperty(value = "关联场景ID")
private Long defenseSceneId;
+ /**
+ * 场景名称
+ */
+ @ApiModelProperty(value = "场景名称")
+ private String defenseSceneName;
/**
* 调度经度
*/
@@ -122,11 +131,6 @@
*/
@ApiModelProperty(value = "状态（0正常 1停用）")
private Integer status;
- /**
- * 删除标志（0存在 1删除）
- */
- @ApiModelProperty(value = "删除标志（0存在 1删除）")
- private Integer isDeleted;
/**
* 设备sn
*/
--
Gitblit v1.9.3