Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

648540858

2022-04-20 088419b4d8965e37774a217c5a8135e95fc82c5a

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java

@@ -65,7 +65,4 @@
        }
        return result;
    }



}