From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java | 92 +++++++++++++++------------------------------
1 files changed, 31 insertions(+), 61 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
index d090c92..968304b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
@@ -1,12 +1,10 @@
package com.ruoyi.system.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.EqualsAndHashCode;
/**
* OSS瀵硅薄瀛樺偍瀵硅薄
@@ -14,67 +12,39 @@
* @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("sys_oss")
-public class SysOss implements Serializable {
+public class SysOss extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ /**
+ * 瀵硅薄瀛樺偍涓婚敭
+ */
+ @TableId(value = "oss_id")
+ private Long ossId;
+ /**
+ * 鏂囦欢鍚�
+ */
+ private String fileName;
- /**
- * 瀵硅薄瀛樺偍涓婚敭
- */
- @TableId(value = "oss_id", type = IdType.AUTO)
- private Long ossId;
+ /**
+ * 鍘熷悕
+ */
+ private String originalName;
- /**
- * 鏂囦欢鍚�
- */
- private String fileName;
+ /**
+ * 鏂囦欢鍚庣紑鍚�
+ */
+ private String fileSuffix;
- /**
- * 鍘熷悕
- */
- private String originalName;
+ /**
+ * URL鍦板潃
+ */
+ private String url;
- /**
- * 鏂囦欢鍚庣紑鍚�
- */
- private String fileSuffix;
-
- /**
- * URL鍦板潃
- */
- private String url;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 涓婁紶浜�
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
- * 鏇存柊浜�
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 鏈嶅姟鍟�
- */
- private String service;
+ /**
+ * 鏈嶅姟鍟�
+ */
+ private String service;
}
--
Gitblit v1.9.3