From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
index 458f73c..25fcf39 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java
@@ -3,6 +3,8 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+import java.util.List;
+
/**
* AlarmDataParam
*
@@ -32,10 +34,16 @@
*/
@JsonProperty("AlgoName")
private String algoName;
+
+ @JsonProperty("AlarmType")
+ private Integer alarmType;
+
+ @JsonProperty("AlarmName")
+ private String alarmName;
/**
* 绠楁硶妫�鍑哄璞′俊鎭紙閫氬父涓�涓棰戝垎鏋愭湇鍔℃姤璀﹀彧鍖呭惈涓�涓洰鏍囦俊鎭�傚浘鐗囩被澶氱洰鏍囨娴嬬被绠楁硶闄ゅ銆傦級
*/
@JsonProperty("AlarmObject")
- private Object alarmObject;
+ private List<AlarmObject> alarmObject;
}
--
Gitblit v1.8.0