From b5a5e43e2ea7af773dba1ee99c2194be61515df8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 二月 2026 18:21:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen

---
 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 fe00ce3..ca2f0f0 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
@@ -26,9 +26,15 @@
     @ApiModelProperty(value = "安全报告模板id")
     private Integer safetyId;
 
+    @ApiModelProperty(value = "安全报告模板名称")
+    private String safetyName;
+
     @ApiModelProperty(value = "设备模板id")
     private Integer deviceTemplateId;
 
+    @ApiModelProperty(value = "设备模板名称")
+    private String deviceTemplateName;
+
     @ApiModelProperty(value = "1开启 2关闭 重大隐患")
     private Integer bigHiddenDanger;
 

--
Gitblit v1.7.1