From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
index 2086b80..a4512b6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java
@@ -40,13 +40,20 @@
* 鎺ユ敹鏃堕棿
*/
String receiveTime;
-
+ /**
+ * 鏄惁PTZ寮曞
+ */
+ Boolean isGuidePTZ;
/**
* 寮曞鐩爣缁忕含搴�
*/
- double[] targetPosition;
-
- /** 寮曞PTZ鍊� */
- private GuidePTZ guidePTZ;
-
+ GuidePoint targetPosition;
+ /**
+ * 寮曞鐩爣PTZ
+ */
+ GuidePTZ targetPTZ;
+ /**
+ * 浜曞彿
+ */
+ String wellId;
}
--
Gitblit v1.9.3