From cb5035579ae02a3aca05904ab419816f2fc509f2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
index 379d083..472f2b5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
@@ -20,7 +20,10 @@
@NoArgsConstructor
public class ArdCameras extends BaseEntity {
private static final long serialVersionUID = 1L;
-
+ public ArdCameras(String gdtype)
+ {
+ this.gdtype=gdtype;
+ }
/**
* id
*/
@@ -158,7 +161,9 @@
*/
@Excel(name = "鏈�澶у彲瑙嗚窛绂�")
private Double camMaxVisibleDistance;
-
+ /** 鐩告満鎶ヨ寮曞寮�鍏� */
+ @Excel(name = "鐩告満鎶ヨ寮曞寮�鍏�")
+ private Integer camAlarmGuideEnable;
/**
* 鎵�灞炲ID
*/
--
Gitblit v1.9.3