From e7e275486fdd2f67e3df2c41f416815ab8fa9f61 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 25 Jun 2024 15:03:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/network/netinfo/netinfo.html   | 1 +
 .../main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
index c22de4b..c0934be 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/netinfo.html
@@ -13,6 +13,7 @@
                             <li>
                                 <label>设备编号：</label>
                                 <input type="text" name="id"/>
+                                <input type="hidden" name="netId" th:value="*{netId}"/>
                             </li>
                             <li>
                                 <label>网络设备品牌：</label>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java
index 5f061c3..265bcfc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyNetinfo.java
@@ -35,7 +35,7 @@ public class TdPropertyNetinfo extends BaseEntity
     private String netNo;
 
     /** 设备种类 */
-    @Excel(name = "设备种类")
+    @Excel(name = "设备种类", readConverterExp = "1=服务器,2=路由器,3=防火墙,4=网关,5=其他")
     private String netName;
 
     /** 序列号 */
@@ -51,7 +51,7 @@ public class TdPropertyNetinfo extends BaseEntity
     private String netManager;
 
     /** 密级（0：秘密1：机密2：绝密） */
-    @Excel(name = "密级", readConverterExp = "0=：秘密1：机密2：绝密")
+    @Excel(name = "密级", readConverterExp = "0=秘密,1=机密,2=绝密")
     private String netMiji;
 
     /** 涉密网络名称 */