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

---
 .../resources/templates/system/property/data/propertyinfo.html  | 1 +
 .../src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
index 589bc7c..95dfcb0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
@@ -13,6 +13,7 @@
                             <li>
                                 <label>登记编号：</label>
                                 <input type="text" name="id"/>
+                                <input type="hidden" name="useId" th:value="*{useId}"/>
                             </li>
                             <li>
                                 <label>资产种类：</label>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
index 5c8e642..37a7235 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
@@ -37,7 +37,7 @@ public class TdPropertyInfo extends BaseEntity
     private String propertyNetstyle;
 
     /** 资产种类 */
-    @Excel(name = "资产种类")
+    @Excel(name = "资产种类", readConverterExp = "0=单项导入设备,1=涉密计算机,2=移动硬盘,3=涉密U盘,4=复印机,5=打印机,6=录音带,7=录像带,8=传真机,9=照相机,10=录音笔,11=光盘,12=软盘,13=其他")
     private String propertyType;
 
     /** 资产型号 */