From 12cb0f2f79f216864b8f68b63309f409db68e02f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Thu, 22 Jan 2026 11:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
index c92be6f..eccb464 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneVO.java
@@ -16,10 +16,9 @@
  */
 package org.sxkj.fw.area.vo;
 
+import java.util.Date;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import java.util.Date;
 
 /**
  * 防控场景表 视图实体类
@@ -116,4 +115,15 @@
 
 	@ApiModelProperty(value = "反制设备数量")
 	private Integer counterDeviceCount;
+
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Long updateUser;
+	/**
+	 * 状态（0正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
+	private Integer status;
 }

--
Gitblit v1.9.3