Merge branch 'main' into main2

648540858

2023-01-05 6fa5b37b962b05b3aa4b7bf019eb47c4cdbb5738

 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -43,6 +43,8 @@

    private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;

    private Boolean pushStreamAfterAck = Boolean.FALSE;

    private String serverId = "000000";

    private String thirdPartyGBIdReg = "[\\s\\S]*";
@@ -206,4 +208,12 @@
    public void setBroadcastForPlatform(String broadcastForPlatform) {
        this.broadcastForPlatform = broadcastForPlatform;
    }

    public Boolean getPushStreamAfterAck() {
        return pushStreamAfterAck;
    }

    public void setPushStreamAfterAck(Boolean pushStreamAfterAck) {
        this.pushStreamAfterAck = pushStreamAfterAck;
    }
}