From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index ef2eecd..b056cc7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -53,7 +53,7 @@
/**
* 璁惧鍥芥爣缂栧彿
*/
- @Schema(description = "11111")
+ @Schema(description = "璁惧鍥芥爣缂栧彿")
private String deviceGBId;
/**
@@ -84,13 +84,13 @@
* 娉ㄥ唽鍛ㄦ湡 (绉�)
*/
@Schema(description = "娉ㄥ唽鍛ㄦ湡 (绉�)")
- private String expires;
+ private int expires;
/**
* 蹇冭烦鍛ㄦ湡(绉�)
*/
@Schema(description = "蹇冭烦鍛ㄦ湡(绉�)")
- private String keepTimeout;
+ private int keepTimeout;
/**
* 浼犺緭鍗忚
@@ -113,7 +113,6 @@
/**
* RTCP娴佷繚娲�
- * TODO 棰勭暀, 鏆備笉瀹炵幇
*/
@Schema(description = "RTCP娴佷繚娲�")
private boolean rtcp;
@@ -286,19 +285,19 @@
this.password = password;
}
- public String getExpires() {
+ public int getExpires() {
return expires;
}
- public void setExpires(String expires) {
+ public void setExpires(int expires) {
this.expires = expires;
}
- public String getKeepTimeout() {
+ public int getKeepTimeout() {
return keepTimeout;
}
- public void setKeepTimeout(String keepTimeout) {
+ public void setKeepTimeout(int keepTimeout) {
this.keepTimeout = keepTimeout;
}
--
Gitblit v1.8.0