From cb5035579ae02a3aca05904ab419816f2fc509f2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
index b8cf663..4ec8ce2 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
@@ -8,7 +8,8 @@
 @Data
 @ApiModel(description = "sdk鍛戒护瀹炰綋绫�")
 public class CameraCmd {
-
+    /*鍛戒护鏍囪瘑*/
+    String cmdType;
     /*鐩告満ID*/
     String cameraId;
     /*鐩告満閫氶亾鍙�*/
@@ -26,16 +27,15 @@
     /*PTZ鍊�*/
     Map<String,Double>ptzMap;
 
-    /*鐩告満缁忕含搴�*/
-    double[] camPosition;
     /*鐩爣缁忕含搴�*/
     double[] targetPosition;
 
     /*褰撳墠鎿嶄綔鑰�*/
     String operator;
-    /*杩囨湡闂撮殧锛堝垎閽燂級*/
+    /*杩囨湡闂撮殧锛堢锛�*/
     Integer expired;
-
+    /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+    String operatorZh;
     /*褰曞儚瀛樺偍姹犲悕绉�*/
     String recordBucketName;
     /*褰曞儚鏂囦欢鍚嶇О*/

--
Gitblit v1.9.3