From a1a7bb5093d30397078ce42ef025cd07378d1e1c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 15:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/pojo/StorageBlob.java | 39 ++++++++++-----------------------------
1 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java b/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
index 188d9c5..7f7e961 100644
--- a/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
+++ b/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
@@ -1,20 +1,13 @@
package com.ruoyi.basic.pojo;
-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.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
/**
* 閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭� 瀹炰綋绫�
*
- * @author ruoyi
- * @date 2025-05-29
*/
@Data
@TableName("storage_blob")
@@ -22,22 +15,14 @@
private static final long serialVersionUID = 1L;
- /**
- *
- */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
- /** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// @TableField(fill = FieldFill.INSERT)
- private Date createTime;
/**
* 璧勬簮id
*/
- @TableField(value = "key")
- private String key;
+ @TableField(value = "resource_key")
+ private String resourceKey;
/**
* 璧勬簮绫诲瀷锛屼緥濡侸PG鍥剧墖鐨勮祫婧愮被鍨嬩负image/jpg
*/
@@ -50,15 +35,11 @@
private String originalFilename;
/**
- * 瀛樺偍妗朵腑
+ * 鍞竴鏂囦欢鍚嶇О
*/
- @TableField(value = "bucket_filename")
- private String bucketFilename;
- /**
- * 瀛樺偍妗跺悕
- */
- @TableField(value = "bucket_name")
- private String bucketName;
+ @TableField(value = "uid_filename")
+ private String uidFilename;
+
/**
* 璧勬簮灏哄(瀛楄妭)
*/
@@ -66,8 +47,8 @@
private Long byteSize;
/**
- * 0鐢熶骇鍓� 1鐢熶骇鍚� 2鐢熶骇闂
+ * 鏂囦欢璺緞
*/
- @TableField(value = "type")
- private Long type;
+ @TableField(value = "path")
+ private String path;
}
\ No newline at end of file
--
Gitblit v1.9.3