Merge branch 'refs/heads/2.7.0'

# Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2024-04-24 20:51:28 +08:00
parent 1a30992985 2113e8cf27
commit b89af9a693
6 changed files with 320 additions and 331 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -535,11 +535,11 @@ public class DeviceChannel {
 		this.subCount = subCount;
 	}

-	public boolean isHasAudio() {
+	public Boolean getHasAudio() {
 		return hasAudio;
 	}

-	public void setHasAudio(boolean hasAudio) {
+	public void setHasAudio(Boolean hasAudio) {
 		this.hasAudio = hasAudio;
 	}