From 6681665f66b71633182eec48597c952834843a1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 17:06:58 +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 6c3a0f4..fc22371 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
@@ -22,4 +22,10 @@
 
     @ApiModelProperty(value = "1委托方 2项目")
     private Integer type;
+
+    @ApiModelProperty(value = "安全报告模板id")
+    private Integer safetyId;
+
+    @ApiModelProperty(value = "设备模板id")
+    private Integer deviceTemplateId;
 }

--
Gitblit v1.7.1