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/vo/SysOssConfigVo.java |   72 +++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
index 06b00d3..616e4e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
@@ -1,94 +1,90 @@
 package com.ruoyi.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
-
 
 
 /**
- * 浜戝瓨鍌ㄩ厤缃鍥惧璞� sys_oss_config
+ * 瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄 sys_oss_config
  *
- * @author ruoyi
- * @date 2021-08-11
+ * @author Lion Li
+ * @author 瀛よ垷鐑熼洦
+ * @date 2021-08-13
  */
 @Data
-@ApiModel("浜戝瓨鍌ㄩ厤缃鍥惧璞�")
 @ExcelIgnoreUnannotated
 public class SysOssConfigVo {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-     *  涓诲缓
+    /**
+     * 涓诲缓
      */
-	@ApiModelProperty("涓诲缓")
-	private Integer ossConfigId;
+    private Long ossConfigId;
 
     /**
      * 閰嶇疆key
      */
-	@ApiModelProperty("閰嶇疆key")
-	private String configKey;
+    private String configKey;
 
     /**
      * accessKey
      */
-	@ApiModelProperty("accessKey")
-	private String accessKey;
+    private String accessKey;
 
     /**
      * 绉橀挜
      */
-	@ApiModelProperty("secretKey")
-	private String secretKey;
+    private String secretKey;
 
     /**
      * 妗跺悕绉�
      */
-	@ApiModelProperty("妗跺悕绉�")
-	private String bucketName;
+    private String bucketName;
 
     /**
      * 鍓嶇紑
      */
-	@ApiModelProperty("鍓嶇紑")
-	private String prefix;
+    private String prefix;
 
     /**
      * 璁块棶绔欑偣
      */
-	@ApiModelProperty("璁块棶绔欑偣")
-	private String endpoint;
+    private String endpoint;
 
     /**
-     * 鏄惁htpps锛�0鍚� 1鏄級
+     * 鑷畾涔夊煙鍚�
      */
-	@ApiModelProperty("鏄惁htpps锛�0鍚� 1鏄級")
-	private String isHttps;
+    private String domain;
+
+    /**
+     * 鏄惁https锛圷=鏄�,N=鍚︼級
+     */
+    private String isHttps;
 
     /**
      * 鍩�
      */
-	@ApiModelProperty("鍩�")
-	private String region;
+    private String region;
 
     /**
-     * 鐘舵��(0姝ｅ父 1鍋滅敤)
+     * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
      */
-	@ApiModelProperty("鐘舵��(0姝ｅ父 1鍋滅敤)")
-	private String status;
+    private String status;
 
     /**
      * 鎵╁睍瀛楁
      */
-	@ApiModelProperty("鎵╁睍瀛楁")
-	private String ext1;
+    private String ext1;
 
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
+    /**
+     * 妗舵潈闄愮被鍨�(0private 1public 2custom)
+     */
+    private String accessPolicy;
 
 }

--
Gitblit v1.9.3