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/service/IDeviceService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
index 1f3d583..0eaf9d6 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
@@ -241,7 +241,7 @@
      * @param propertyEnum
      * @param param
      */
-    void devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param);
+    ResponseResult devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param);
 
     /**
      * 更改静音模型
@@ -263,6 +263,9 @@
      */
     Boolean checkDeviceOnline(String sn);
 
+    void sendCameraInfo();
 
+    void setRedisCameraPosition(String sn, Integer cameraPosition);
+    void setChildRedisCamera(String sn, String context);
 //    public List<DeviceEntity> selectList(Wrapper<DeviceEntity> queryWrapper);
 }
\ No newline at end of file

--
Gitblit v1.9.3