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/record/dto/FwDroneAlarmRecordDTO.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
index f11db1f..0a95aa4 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -151,6 +151,15 @@
 	@ApiModelProperty(value = "当前用户id")
 	private Long currentUserId;
 
-	@ApiModelProperty(value = "部门id")
+	@ApiModelProperty(value = "部门集合",hidden = true)
 	private List<Long> deptList;
+
+	@ApiModelProperty(value = "共享设备编号集合",hidden = true)
+	private List<Long> sharedDeviceIdList;
+	// 当前用户部门ID
+	@ApiModelProperty(value = "当前用户部门ID",hidden = true)
+	private String currentDeptId;
+	// regionName
+	@ApiModelProperty(value = "regionName",hidden = true)
+	private String regionName;
 }

--
Gitblit v1.9.3