From adb2f4594760ff2b18e83b8cff5c4ce99dfdff45 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 16:01:05 +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/AlarmParam.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmParam.java b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmParam.java
index 285624f..5f0ba80 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/video/AlarmParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/video/AlarmParam.java
@@ -28,5 +28,5 @@
      * 鎶ヨ淇℃伅锛堥�氬父琛屼负绫荤畻娉曟姤璀︿竴娆″彧浼氬寘鍚竴涓姤璀︿俊鎭�傜函鍗曞抚鍥剧墖妫�娴嬬被鍒嗘瀽鏈嶅姟鏈夊彲鑳戒細鍑虹幇鍚屼竴寮犲浘锛屽搴斿涓笉鍚岀畻娉曠殑妫�娴嬬粨鏋滅殑鎯呭喌锛屼粠鑰屼笂鎶ュ涓姤璀︿俊鎭級
      */
     @JsonProperty("AlarmData")
-    private List<AlarmDataParam> alarmData;
+    private AlarmDataParam alarmData;
 }

--
Gitblit v1.8.0