Merge branch 'master' into dev/zlm

648540858

2024-04-09 b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347

 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookParam.java

old mode 100644
new mode 100755
@@ -7,6 +7,8 @@
public class HookParam {
    private String mediaServerId;



    public String getMediaServerId() {
        return mediaServerId;
    }