Merge remote-tracking branch 'origin/master'

vehicle-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -38,7 +38,7 @@ public class CaneraConfig {
     @Value("${base.bakUrl:http://124.70.58.209:18891}")
     private String bakUrl;
 
-    @Value("${base.bakUrl:rtsp://124.70.58.209:8554}")
+    @Value("${base.bakUrlRtsp:rtsp://124.70.58.209:8554}")
     private String bakUrlRtsp;
 
     @Value("${base.wsUrl:http://124.70.58.209:18891}")