From e4f4ca3ca6089b4e707141c9984d2610a44c5173 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 16 Jul 2026 17:14:32 +0800
Subject: [PATCH] fix(device): 修复设备查询条件错误

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
index b229990..097d995 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
@@ -17,6 +17,7 @@
 package org.sxkj.fw.device.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +25,7 @@
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 设备表 实体类
@@ -165,6 +167,19 @@
 	private String finalOutboundArea;
 
 	@ApiModelProperty(value = "是否启用：1启用 0禁用")
-	private Boolean isEnabled;
+	private Integer isEnabled;
+
+	/**
+	 * 使用日期
+	 */
+	@ApiModelProperty(value = "使用日期")
+	// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date useDate;
+
+	/**
+	 * 使用年限（单位：年）
+	 */
+	@ApiModelProperty(value = "使用年限（单位：年）")
+	private Integer serviceLife;
 
 }

--
Gitblit v1.9.3