From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 04 十二月 2023 17:47:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/dto/video/AlarmObject.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmObject.java b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmObject.java index 18f593b..02601e9 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmObject.java +++ b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmObject.java @@ -9,6 +9,12 @@ public class AlarmObject { @JsonProperty("ObjectRect") - List<ObjectRect> objectRect; + ObjectRect objectRect; + + @JsonProperty("ObjectID") + Integer ObjectID; + + @JsonProperty("ObjectTag") + String ObjectTag; } -- Gitblit v1.8.0