From 5e73881ef728238e7f7a3bd5d74cf41f3f6b0923 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
index f1aa5a0..307baa9 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -143,9 +143,11 @@
 	@ApiModelProperty(value = "经度")
 	private String longitude;
 
-
-
-
+	@ApiModelProperty(value = "部门集合",hidden = true)
+	private List<Long> deptList;
+	// 当前用户部门id
+	@ApiModelProperty(value = "部门id",hidden = true)
+	private String currentDeptId;
 
 
 	/**
@@ -178,4 +180,5 @@
 	 */
 	@ApiModelProperty(value = "删除标志（0存在 1删除）")
 	private Integer isDeleted;
+
 }

--
Gitblit v1.9.3