Merge branch 'master' of https://github.com/swwheihei/wvp.git

songww

2020-05-09 2e778e342afe67cd9f2e40ceec326732fa1730c1

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

@@ -16,7 +16,6 @@
   String sipPassword;
   @Value("${media.ip}")
   String mediaIp;
	
   @Value("${media.port}")
   Integer mediaPort;