From 1f45c25ea725445d7e78e8d5da6e72150f35f2eb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:09:30 +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 | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 29b6059..a5e5980 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
@@ -1,6 +1,8 @@
package com.ycl.entity.video;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,10 +16,10 @@
/**
* VideoAlarmReport
*
- * @author: AI
- * @date: 2022-09-20 17:14
* @version V1.0
-**/
+ * @author: AI
+ * @date: 2022-09-20 17:14
+ **/
@TableName("ums_video_alarm_report")
@Data
@NoArgsConstructor
@@ -27,7 +29,7 @@
public class VideoAlarmReport {
@ApiModelProperty("$column.comment")
- @TableField("owner")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("璁块棶鍦板潃")
@@ -74,7 +76,18 @@
@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;
+
+ @TableField(exist = false)
+ private byte[] picByte;
}
--
Gitblit v1.8.0