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/entity/video/VideoAlarmReport.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
index 57049bf..77d88b9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoAlarmReport.java
@@ -76,6 +76,14 @@
     @TableField("algo_name")
     private String algoName;
 
+    @ApiModelProperty("鎶ヨ绫诲瀷鐮�")
+    @TableField("alarm_type")
+    private Integer alarmType;
+
+    @ApiModelProperty("鎶ヨ绫诲瀷鍚嶇О")
+    @TableField("alarm_name")
+    private String alarmName;
+
     @ApiModelProperty("绠楁硶妫�鍑哄璞″湪鍥剧墖涓殑鍧愭爣")
     @TableField("alarm_obj")
     private String alarmObj;

--
Gitblit v1.8.0