From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/dto/video/AlarmDataParam.java | 4 +++-
1 files changed, 3 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 c5de217..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
*
@@ -42,6 +44,6 @@
* 绠楁硶妫�鍑哄璞′俊鎭紙閫氬父涓�涓棰戝垎鏋愭湇鍔℃姤璀﹀彧鍖呭惈涓�涓洰鏍囦俊鎭�傚浘鐗囩被澶氱洰鏍囨娴嬬被绠楁硶闄ゅ銆傦級
*/
@JsonProperty("AlarmObject")
- private Object alarmObject;
+ private List<AlarmObject> alarmObject;
}
--
Gitblit v1.8.0