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/entity/WaylineJobEntity.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java b/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java
index feca1fa..2c80622 100644
--- a/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java
+++ b/src/main/java/com/dji/sample/wayline/model/entity/WaylineJobEntity.java
@@ -117,4 +117,10 @@
      */
     @TableField(value = "execute_start_time_arr",typeHandler = FastjsonTypeHandler.class)
     private List<List<Long>> executeStartTimeArr;
+
+    @TableField("collect_status")
+    private Boolean collectStatus;
+
+    @TableField("user_id")
+    private String userId;
 }

--
Gitblit v1.9.3