From 824635df7f95b68ff493b904071e6c053fad9f9b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 13 八月 2021 12:37:34 +0800
Subject: [PATCH] update 修正 PR 相关问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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..58e3900 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,21 +1,18 @@
 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
  *
- * @author ruoyi
- * @date 2021-08-11
+ * @author Lion Li
+ * @author 瀛よ垷鐑熼洦
+ * @date 2021-08-13
  */
 @Data
 @ApiModel("浜戝瓨鍌ㄩ厤缃鍥惧璞�")
@@ -25,10 +22,10 @@
 	private static final long serialVersionUID = 1L;
 
 	/**
-     *  涓诲缓
+     * 涓诲缓
      */
 	@ApiModelProperty("涓诲缓")
-	private Integer ossConfigId;
+	private Long ossConfigId;
 
     /**
      * 閰嶇疆key
@@ -67,9 +64,9 @@
 	private String endpoint;
 
     /**
-     * 鏄惁htpps锛�0鍚� 1鏄級
+     * 鏄惁https锛圷=鏄�,N=鍚︼級
      */
-	@ApiModelProperty("鏄惁htpps锛�0鍚� 1鏄級")
+	@ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級")
 	private String isHttps;
 
     /**
@@ -79,9 +76,9 @@
 	private String region;
 
     /**
-     * 鐘舵��(0姝e父 1鍋滅敤)
+     * 鐘舵�侊紙0=姝e父,1=鍋滅敤锛�
      */
-	@ApiModelProperty("鐘舵��(0姝e父 1鍋滅敤)")
+	@ApiModelProperty("鐘舵�侊紙0=姝e父,1=鍋滅敤锛�")
 	private String status;
 
     /**
@@ -90,5 +87,10 @@
 	@ApiModelProperty("鎵╁睍瀛楁")
 	private String ext1;
 
+	/**
+	 * 澶囨敞
+	 */
+	@ApiModelProperty("澶囨敞")
+	private String remark;
 
 }

--
Gitblit v1.9.3