From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
index 7ce55e1..1c4ef37 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
@@ -68,4 +68,8 @@
     private Long workType;
 
     private String webrtcUrl;
+
+    private String cameraWebrtcUrl;
+
+    private String cameraState;
 }
\ No newline at end of file

--
Gitblit v1.9.3