Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/jlmap3d/jl3dpassflow/jl3dpassflownew.js

@@ -286,7 +286,7 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
 	// load a resource
 	loader.load(
 		// resource URL
-		'../../static/MODEL/path/path.obj',
+		'../../static/jl3d/path/path.obj',
 		// called when resource is loaded
 		function ( object ) {
 

src/jlmap3d/main/loaders/SimulationLoadNew.js

@@ -69,7 +69,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     let signaldata = JSON.parse(netdata.signals);
     let standsdata = JSON.parse(netdata.stands);
     let psddata = data.psdList;
-    console.log(standsdata);
+    console.log(netdata.assets);
     assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList);
     // assetloader.setmodellistnew(netdata.assets);