From f007ff0ff20a60da94ee6080a7b95b575412c82c Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 18 Jun 2024 17:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A9=BA=E9=97=B4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/vo/SysOssPersonVo.java      | 37 ++++++++++++-------
 .../system/domain/vo/SysOssResourceVo.java    |  1 -
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java
index e55b2da..79bf6dc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java
@@ -1,12 +1,11 @@
 package org.dromara.system.domain.vo;
 
-import org.dromara.system.domain.SysOssPerson;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysOssPerson;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -21,7 +20,6 @@ import java.util.Date;
  * @date 2024-06-13
  */
 @Data
-@ExcelIgnoreUnannotated
 @AutoMapper(target = SysOssPerson.class)
 public class SysOssPersonVo implements Serializable {
 
@@ -29,34 +27,45 @@ public class SysOssPersonVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private Long id;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private Long ossId;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private Long catalogId;
 
     /**
-     * 
+     *
      */
-    @ExcelProperty(value = "")
     private String fileName;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String filePath;
 
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * 容量
+     */
+    private String volume;
+
+    private Date createTime;
+
+    @Translation(type = TransConstant.USER_ID_TO_NAME)
+    private Long createBy;
+
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java
index 36001a0..39ed6ee 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java
@@ -18,7 +18,6 @@ import java.util.Date;
  * @date 2024-05-28
  */
 @Data
-
 @AutoMapper(target = SysOssResource.class)
 public class SysOssResourceVo implements Serializable {