From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
index 9045f70..c9795df 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceScrapDTO.java
@@ -16,9 +16,14 @@
*/
package org.sxkj.fw.device.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 设备报废记录表 数据传输对象实体类
@@ -27,8 +32,40 @@
* @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceScrapDTO extends FwDeviceScrapEntity {
+public class FwDeviceScrapDTO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ /**
+ * 设备ID（关联ja_fw_device.id）
+ */
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
+ /**
+ * 报废时间
+ */
+ @ApiModelProperty(value = "报废时间")
+ private Date scrapTime;
+ /**
+ * 报废原因
+ */
+ @ApiModelProperty(value = "报废原因")
+ private String scrapReason;
+ /**
+ * 处置方式
+ */
+ @ApiModelProperty(value = "处置方式")
+ private String disposeWay;
+
+ // 查询使用
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
+ @ApiModelProperty(value = "设备类型")
+ private String deviceType;
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+
}
--
Gitblit v1.9.3