From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
index 2d2d594..4dd0103 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
@@ -27,6 +27,7 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.sxkj.fw.common.FwBaseInfo;
/**
* 无人机飞行记录表 数据传输对象实体类
@@ -35,7 +36,7 @@
* @since 2026-01-08
*/
@Data
- public class FwDroneFlightRecordDTO implements Serializable {
+ public class FwDroneFlightRecordDTO extends FwBaseInfo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
@@ -90,14 +91,5 @@
@ApiModelProperty(value = "区域名称")
private String areaName;
-
- @ApiModelProperty(value = "部门集合",hidden = true)
- private List<Long> deptList;
-
- @ApiModelProperty(value = "部门id",hidden = true)
- private String currentDeptId;
- // setRegionName
- @ApiModelProperty(value = "区域名称",hidden = true)
- private String regionName;
}
--
Gitblit v1.9.3