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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 89d19d6..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,19 +25,17 @@
private String workspaceId;
- private String deviceIndex;
+ private String controlSource;
private String deviceDesc;
private String childDeviceSn;
- private String domain;
+ private Integer domain;
private Integer type;
private Integer subType;
-
- private List<DeviceDTO> gatewaysList;
private List<DevicePayloadDTO> payloadsList;
@@ -60,4 +58,10 @@
private String workspaceName;
private DeviceDTO children;
+
+ private Integer firmwareStatus;
+
+ private Integer firmwareProgress;
+
+ private String parentSn;
}
\ No newline at end of file
--
Gitblit v1.9.3