Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-04 a2cac5ca12f100d052cb31122a84de4bba829bca

 src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java

@@ -114,4 +114,5 @@
     * @return
     */
    ResourceBaseInfo getOverview();

}