Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-01-05 ce035dbcdb38fc1f73ec82f54336f490a632b53b

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

@@ -35,7 +35,7 @@

    private Boolean useSourceIpAsStreamIp = Boolean.FALSE;

    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.TRUE;
    private Boolean sipUseSourceIpAsRemoteAddress = Boolean.FALSE;

    private Boolean streamOnDemand = Boolean.TRUE;