From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 15:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0aec885..56d5e9c 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
@@ -81,7 +81,7 @@
/**
* 鍏佽浜戝彴鎺у埗
*/
- private boolean PTZEnable;
+ private boolean ptz;
/**
* RTCP娴佷繚娲�
@@ -220,12 +220,12 @@
this.characterSet = characterSet;
}
- public boolean isPTZEnable() {
- return PTZEnable;
+ public boolean isPtz() {
+ return ptz;
}
- public void setPTZEnable(boolean PTZEnable) {
- this.PTZEnable = PTZEnable;
+ public void setPtz(boolean ptz) {
+ this.ptz = ptz;
}
public boolean isRtcp() {
@@ -251,4 +251,5 @@
public void setChannelCount(int channelCount) {
this.channelCount = channelCount;
}
+
}
--
Gitblit v1.8.0