Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/TheCommandPlatform-Anxin

src/app/canvas-share-data.service.ts

@@ -84,7 +84,7 @@ export class CanvasShareDataService {
     car.assetData.Pipelines.forEach(pipeline => {
       const icon = pipeline.assetData.LinkedObjects.find(i => i !== car);
       if (icon.assetData.Type === 0) {
-        car.assetData.WaterOccupy.push(icon.assetData.Name);
+        waterOccupy.push(icon.assetData.Name);
       }
     });
     return waterOccupy;