From fbb48357d807b6e776821decacda68af6b2cc6aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 14:02:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 788e9eb..6ba55b1 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
@@ -26,6 +26,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 设备表 视图实体类
@@ -106,6 +107,9 @@
 	@ApiModelProperty("运行状态(0:在线/1:离线/2:故障/3:报废)")
 	private Integer status;
 
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
 	/**
 	 * 电量百分比 0-100
 	 */

--
Gitblit v1.9.3