From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
index fa24638..2e9edad 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java
@@ -1,9 +1,11 @@
package com.ruoyi.alarm.global.domain;
+import com.ruoyi.device.camera.domain.ArdCameras;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
+import java.util.List;
/**
* @Description: 寮曞鏁版嵁瀹炰綋
@@ -20,8 +22,8 @@
String alarmId;
String alarmType;
Date receiveTime;
- Integer num;
- Integer recordSn;
- double[] targetPosition;
GuidePTZ guidePTZ;
+ GuidePoint targetPosition;
+ String wellId;
+ Boolean isGuidePTZ;//鏄惁ptz寮曞
}
--
Gitblit v1.9.3