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/device/dto/FwDeviceDTO.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 ff6288d..8ed7243 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
@@ -23,6 +23,8 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 设备表 数据传输对象实体类
@@ -36,6 +38,7 @@
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "主键")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private	Long id;
 
 	/**
@@ -113,6 +116,12 @@
 	private int effectiveRangeKmIsNotNull ;
 
 	/**
+	 * 是否出库
+	 */
+	@ApiModelProperty(value = "是否出库 0不过滤 1是 2否")
+	private int isTrack;
+
+	/**
 	 * 设备状态，多个状态用逗号隔
 	 */
 	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
@@ -134,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;
 
 
 	/**
@@ -169,4 +180,8 @@
 	 */
 	@ApiModelProperty(value = "删除标志（0存在 1删除）")
 	private Integer isDeleted;
+	// setRegionName
+	@ApiModelProperty(value = "区域名称")
+	private String regionName;
+
 }

--
Gitblit v1.9.3