From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
index 68466d7..d4c7399 100644
--- a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
+++ b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
@@ -25,7 +25,7 @@
private String workspaceId;
- private String deviceIndex;
+ private String controlSource;
private String deviceDesc;
@@ -62,4 +62,6 @@
private Integer firmwareStatus;
private Integer firmwareProgress;
+
+ private String parentSn;
}
\ No newline at end of file
--
Gitblit v1.9.3