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 @@
  • +
  • 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; /** 资产型号 */