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/FwDefenseZoneVO.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
index c57a5e2..a2000c1 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseZoneVO.java
@@ -16,11 +16,10 @@
  */
 package org.sxkj.fw.area.vo;
 
+import java.util.Date;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 防区管理表 视图实体类
@@ -97,4 +96,20 @@
 
 	@ApiModelProperty(value = "区域数量")
 	private Integer areaCount;
+
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Long updateUser;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 * 状态（0正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
+	private Integer status;
 }

--
Gitblit v1.9.3