From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0

---
 src/main/java/com/dji/sample/manage/model/dto/CapacityCameraDTO.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/model/dto/CapacityCameraDTO.java b/src/main/java/com/dji/sample/manage/model/dto/CapacityCameraDTO.java
index dbc6481..d44fddd 100644
--- a/src/main/java/com/dji/sample/manage/model/dto/CapacityCameraDTO.java
+++ b/src/main/java/com/dji/sample/manage/model/dto/CapacityCameraDTO.java
@@ -18,13 +18,11 @@
 @NoArgsConstructor
 public class CapacityCameraDTO {
 
-    private Integer id;
+    private String id;
 
     private String deviceSn;
 
     private String name;
-
-    private String description;
 
     private String index;
 

--
Gitblit v1.9.3