From 0a0bbb964267bf53b35ae67dc946b7e5d1aaa8e8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 28 一月 2026 16:26:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
index fc22371..fe00ce3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
@@ -28,4 +28,10 @@
 
     @ApiModelProperty(value = "设备模板id")
     private Integer deviceTemplateId;
+
+    @ApiModelProperty(value = "1开启 2关闭 重大隐患")
+    private Integer bigHiddenDanger;
+
+    @ApiModelProperty(value = "1开启 2关闭 一般隐患")
+    private Integer generalHiddenDanger;
 }

--
Gitblit v1.7.1