From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java |   73 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 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..0fb08dd 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,95 @@
 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("浜戝瓨鍌ㄩ厤缃鍥惧璞�")
+@ApiModel("瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄")
 @ExcelIgnoreUnannotated
 public class SysOssConfigVo {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-     *  涓诲缓
+    /**
+     * 涓诲缓
      */
-	@ApiModelProperty("涓诲缓")
-	private Integer ossConfigId;
+    @ApiModelProperty("涓诲缓")
+    private Long ossConfigId;
 
     /**
      * 閰嶇疆key
      */
-	@ApiModelProperty("閰嶇疆key")
-	private String configKey;
+    @ApiModelProperty("閰嶇疆key")
+    private String configKey;
 
     /**
      * accessKey
      */
-	@ApiModelProperty("accessKey")
-	private String accessKey;
+    @ApiModelProperty("accessKey")
+    private String accessKey;
 
     /**
      * 绉橀挜
      */
-	@ApiModelProperty("secretKey")
-	private String secretKey;
+    @ApiModelProperty("secretKey")
+    private String secretKey;
 
     /**
      * 妗跺悕绉�
      */
-	@ApiModelProperty("妗跺悕绉�")
-	private String bucketName;
+    @ApiModelProperty("妗跺悕绉�")
+    private String bucketName;
 
     /**
      * 鍓嶇紑
      */
-	@ApiModelProperty("鍓嶇紑")
-	private String prefix;
+    @ApiModelProperty("鍓嶇紑")
+    private String prefix;
 
     /**
      * 璁块棶绔欑偣
      */
-	@ApiModelProperty("璁块棶绔欑偣")
-	private String endpoint;
+    @ApiModelProperty("璁块棶绔欑偣")
+    private String endpoint;
 
     /**
-     * 鏄惁htpps锛�0鍚� 1鏄級
+     * 鏄惁https锛圷=鏄�,N=鍚︼級
      */
-	@ApiModelProperty("鏄惁htpps锛�0鍚� 1鏄級")
-	private String isHttps;
+    @ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級")
+    private String isHttps;
 
     /**
      * 鍩�
      */
-	@ApiModelProperty("鍩�")
-	private String region;
+    @ApiModelProperty("鍩�")
+    private String region;
 
     /**
-     * 鐘舵��(0姝ｅ父 1鍋滅敤)
+     * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
      */
-	@ApiModelProperty("鐘舵��(0姝ｅ父 1鍋滅敤)")
-	private String status;
+    @ApiModelProperty("鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
+    private String status;
 
     /**
      * 鎵╁睍瀛楁
      */
-	@ApiModelProperty("鎵╁睍瀛楁")
-	private String ext1;
+    @ApiModelProperty("鎵╁睍瀛楁")
+    private String ext1;
 
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty("澶囨敞")
+    private String remark;
 
 }

--
Gitblit v1.9.3