Merge remote-tracking branch 'origin/master'

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -166,7 +166,8 @@ public class VideoService {
                                     name.setText("Audi_A3_2009_red");
                                     Attribute vehicleCategory = node3.attribute("vehicleCategory");
                                     vehicleCategory.setText(po.getVehicleCategory());
-                                    node3.addAttribute("model3d", po.getModel3d());//自车渲染
+                                    //node3.addAttribute("model3d", po.getModel3d());//自车渲染
+                                    node3.addAttribute("model3d", "/root/disk1/simulation-cloud/esmini/resources/models/car_red.osgb");//自车渲染
                                     Iterator<Element> iterator4 = node3.elementIterator();
                                     while (iterator4.hasNext()) {
                                         Element node4 = iterator4.next();