Merge remote-tracking branch 'origin/dev' into dev

roncoo-education-system/roncoo-education-system-feign/src/main/java/com/roncoo/education/system/feign/vo/SysVO.java

@@ -91,6 +91,9 @@ public class SysVO implements Serializable {
 	private String aliyunOssBucket;
 
 	private String aliyunOssEndpoint;
+
+	private String aliyunOasVault;
+
 	/**
 	 * pay_url
 	 */

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/common/req/SysUpdateRESQ.java

@@ -77,6 +77,8 @@ public class SysUpdateRESQ implements Serializable {
 
 	@ApiModelProperty(value = "Endpoint（地域节点）")
 	private String aliyunOssEndpoint;
+	@ApiModelProperty(value = "视频Bucket")
+	private String aliyunOasVault;
 	/**
 	 * smsCode
 	 */

roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/common/resq/SysViewRESQ.java

@@ -77,6 +77,9 @@ public class SysViewRESQ implements Serializable {
 
 	@ApiModelProperty(value = "Endpoint（地域节点）")
 	private String aliyunOssEndpoint;
+
+	@ApiModelProperty(value = "视频Bucket")
+	private String aliyunOasVault;
 	/**
 	 * smsCode
 	 */