From 7dda1f6a2e11411bfc180e58aa375d9617e139e9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 27 三月 2024 17:18:35 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 43a5d48..32b6fac 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -447,16 +447,16 @@
this.password = password;
}
- public int getPTZType() {
+ public int getPtzType() {
return ptzType;
}
- public String getPTZTypeText() {
+ public String getPtzTypeText() {
return ptzTypeText;
}
- public void setPTZTypeText(String PTZTypeText) {
- this.ptzTypeText = PTZTypeText;
+ public void setPtzTypeText(String ptzTypeText) {
+ this.ptzTypeText = ptzTypeText;
}
public boolean isStatus() {
--
Gitblit v1.8.0