From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
index aef18d5..5f9ff52 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwEffectEvalVO.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 FwEffectEvalVO {
+public class FwEffectEvalVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 告警记录ID（ja_fw_drone_alarm_record.id）
@@ -145,10 +149,10 @@
*/
@ApiModelProperty(value = "状态（0正常 1停用）")
private Integer status;
- /**
- * 删除标志（0存在 1删除）
- */
- @ApiModelProperty(value = "删除标志（0存在 1删除）")
- private Integer isDeleted;
+ /**
+ * 是否删除（0正常 1删除）
+ */
+ @ApiModelProperty(value = "是否删除")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3