From c84b9c443d33f0fa8619a4d929363b4ec7b0c9a1 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 21 Jan 2026 16:11:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/dto/GdFlyerDTO.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/dto/GdFlyerDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/dto/GdFlyerDTO.java
index fe229b5..3443a99 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/dto/GdFlyerDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/dto/GdFlyerDTO.java
@@ -16,9 +16,12 @@
*/
package org.sxkj.gd.flyer.dto;
-import org.sxkj.gd.flyer.entity.GdFlyerEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* 飞手表 数据传输对象实体类
@@ -27,8 +30,95 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdFlyerDTO extends GdFlyerEntity {
+public class GdFlyerDTO {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ private Long id;
+ /**
+ * 飞手姓名
+ */
+ @ApiModelProperty(value = "飞手姓名")
+ private String flyerName;
+ /**
+ * 飞手电话（唯一）
+ */
+ @ApiModelProperty(value = "飞手电话（唯一）")
+ private String flyerPhone;
+ /**
+ * 飞行时长（小时）
+ */
+ @ApiModelProperty(value = "飞行时长（小时）")
+ private BigDecimal flightHours;
+ /**
+ * 项目经验
+ */
+ @ApiModelProperty(value = "项目经验")
+ private String projectExperience;
+ /**
+ * 技术专长（0:农业植保 1:电力巡检 2:航拍测绘）
+ */
+ @ApiModelProperty(value = "技术专长（0:农业植保 1:电力巡检 2:航拍测绘）")
+ private String technicalStrength;
+ /**
+ * 擅长机型（0:微型无人机 1:轻型无人机等 2:小型无人机 3:中型无人机等 4:大型无人机）
+ */
+ @ApiModelProperty(value = "擅长机型（0:微型无人机 1:轻型无人机等 2:小型无人机 3:中型无人机等 4:大型无人机）")
+ private String skilledUavType;
+ /**
+ * 擅长任务类型（0:巡查类 1:安保类 2:文旅类 3:采集数据类）
+ */
+ @ApiModelProperty(value = "擅长任务类型（0:巡查类 1:安保类 2:文旅类 3:采集数据类）")
+ private String skilledTaskType;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+ /**
+ * 飞手地址
+ */
+ @ApiModelProperty(value = "飞手地址")
+ private String flyerAddress;
+ /**
+ * 飞手资质证书地址列表
+ */
+ @ApiModelProperty(value = "飞手资质证书地址列表")
+ private List<String> certification;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
+
}
--
Gitblit v1.9.3