Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java

@@ -1,7 +1,6 @@
 package com.genersoft.iot.vmp.common;
 
 import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * 记录每次发送invite消息的状态
@@ -125,20 +124,4 @@ public class InviteInfo {
         this.streamMode = streamMode;
     }
 
-
-    /*=========================设备主子码流逻辑START====================*/
-    @Schema(description = "是否为子码流(true-是，false-主码流)")
-    private boolean subStream;
-
-    public boolean isSubStream() {
-        return subStream;
-    }
-
-    public void setSubStream(boolean subStream) {
-        this.subStream = subStream;
-    }
-
-
-
-
 }