From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java
index 74f463a..abf5e01 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceScrapEntity.java
@@ -17,18 +17,20 @@
package org.sxkj.fw.device.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
/**
* 设备报废记录表 实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_device_scrap")
@@ -36,5 +38,35 @@
@EqualsAndHashCode(callSuper = true)
public class FwDeviceScrapEntity extends BaseEntity {
+ /**
+ * 设备ID（关联ja_fw_device.id）
+ */
+ @TableField("device_id")
+ @ApiModelProperty(value = "设备ID（关联ja_fw_device.id）")
+ private Long deviceId;
+ /**
+ * 报废时间
+ */
+ @TableField("scrap_time")
+ @ApiModelProperty(value = "报废时间")
+ private Date scrapTime;
+ /**
+ * 报废原因
+ */
+ @TableField("scrap_reason")
+ @ApiModelProperty(value = "报废原因")
+ private String scrapReason;
+ /**
+ * 处置方式
+ */
+ @TableField("dispose_way")
+ @ApiModelProperty(value = "处置方式")
+ private String disposeWay;
+ /**
+ * 区域编码
+ */
+ @TableField("area_code")
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3