Merge branch 'master' into 2.7.0

648540858

2024-03-28 53d4d10e1c5b346f01501b3ba5f10beccb2f3864

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

old mode 100644
new mode 100755
@@ -17,4 +17,11 @@
    public void setData(ServerKeepaliveData data) {
        this.data = data;
    }

    @Override
    public String toString() {
        return "OnServerKeepaliveHookParam{" +
                "data=" + data +
                '}';
    }
}