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-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
index af6def8..69c749e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
@@ -16,6 +16,7 @@
  */
 package org.sxkj.fw.device.vo;
 
+import java.util.Date;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import org.sxkj.fw.device.entity.FwDeviceEntity;
@@ -23,10 +24,10 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.sxkj.system.cache.SysCache;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 设备表 视图实体类
@@ -40,6 +41,7 @@
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "主键")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private	Long id;
 
 	/**
@@ -87,6 +89,12 @@
 	 */
 	@ApiModelProperty(value = "所属部门id")
 	private Long belongDept;
+
+	/**
+	 * 设备出入库状态 0未出库1已出库
+	 */
+	@ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+	private Integer trackStatus;
 
 	/**
 	 * 负责人
@@ -168,4 +176,34 @@
 		return SysCache.getDeptName(belongDept);
 	}
 
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Long updateUser;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "出库去向")
+	private String outTarget;
+
+	@ApiModelProperty(value = "是否被共享给当前机构")
+	private Boolean isShared;
+
+	@ApiModelProperty(value = "共享记录ID")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long shareId;
 }

--
Gitblit v1.9.3