From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
index cf93c25..509e61c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDeviceEntity.java
@@ -130,8 +130,17 @@
 	@ApiModelProperty(value = "设备位置")
 	private String location;
 
+	/**
+	 * 设备高度
+	 */
 	@ApiModelProperty(value = "设备高度")
 	private Double height;
 
+	/**
+	 * 是否在机巢中0:是1否
+	 */
+	@ApiModelProperty(value = "是否在机巢中0:是1否")
+	private Integer isWithDock;
+
 
 }

--
Gitblit v1.9.3