Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-01-05 d03e8b042851d6d8ef6b113977d961a1f5814f57

 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;