From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..79b2b17 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,34 +1,31 @@
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;
/**
- * 涓诲缓
+ * 涓诲缓
*/
@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姝ｅ父 1鍋滅敤)
+ * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
*/
- @ApiModelProperty("鐘舵��(0姝ｅ父 1鍋滅敤)")
+ @ApiModelProperty("鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
private String status;
/**
@@ -90,5 +87,10 @@
@ApiModelProperty("鎵╁睍瀛楁")
private String ext1;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ private String remark;
}
--
Gitblit v1.9.3