From 2863822482ada68879c3789a093ba8407979f965 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Tue, 14 Jan 2025 16:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/tc/entity/AssetCurrent.java        | 3 +--
 .../src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java | 2 +-
 .../src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
index 68b6ec9..663416f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
@@ -989,9 +989,8 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @ApiModelProperty("数据资产-数据量")
     private String sjzcSjl;
 
-    @Excel(name = "*数据量单位",sort = 116)
+    @Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
     * 数据资产-是否为涉密数据
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java
index ebf134e..7722a62 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.tc.baseClass.BaseClass;
 import com.ruoyi.tc.entity.request.Acomma;
 import io.swagger.annotations.ApiModel;
@@ -943,7 +944,6 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
 
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
      * 数据资产-是否为涉密数据
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java
index 173eb46..7bc8425 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java
@@ -981,9 +981,8 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     @ApiModelProperty("数据资产-数据量")
     private String sjzcSjl;
 
-    @Excel(name = "*数据量单位", sort = 109)
+    @Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
     @ApiModelProperty("数据资产-数据量单位")
-    @TableField(exist = false)
     private String sjzcSjldw;
     /**
      * 数据资产-是否为涉密数据