From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev
---
src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
index b920530..04cde89 100644
--- a/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
+++ b/src/main/java/com/dji/sample/wayline/model/dto/WaylineTaskCreateDTO.java
@@ -1,5 +1,7 @@
package com.dji.sample.wayline.model.dto;
+import com.dji.sample.wayline.model.enums.WaylineTaskTypeEnum;
+import com.dji.sample.wayline.model.enums.WaylineTemplateTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,9 +20,9 @@
private String flightId;
- private Integer taskType;
+ private WaylineTaskTypeEnum taskType;
- private Integer waylineType;
+ private WaylineTemplateTypeEnum waylineType;
private Long executeTime;
@@ -30,4 +32,7 @@
private Integer outOfControlAction;
+ private WaylineTaskReadyConditionDTO readyConditions;
+
+ private WaylineTaskExecutableConditionDTO executableConditions;
}
--
Gitblit v1.9.3