From eefee3b1cee392b480bd6c29109ad3d8e3cb89c1 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 14 十月 2024 16:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Service/HStation.Service.Revit.Core/01-model/RevitModel.cs |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index e3beba0..720af6b 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -16,19 +16,19 @@
             this.Junctions = new List<RevitJunction>();
             this.Nozzles = new List<RevitNozzle>();
             this.Hydrants = new List<RevitHydrant>();
-            this.Meters = new List<RevitMeter>();
-            this.Flowmeters = new List<RevitFlowmeter>();
-            this.Pressmeters = new List<RevitPressmeter>();
+            this.Bluntheads = new List<RevitBlunthead>();
             this.Elbows = new List<RevitElbow>();
             this.Threelinks = new List<RevitThreelink>();
             this.Fourlinks = new List<RevitFourlink>();
-            this.Bluntheads = new List<RevitBlunthead>();
+            this.Meters = new List<RevitMeter>();
+            this.Flowmeters = new List<RevitFlowmeter>();
+            this.Pressmeters = new List<RevitPressmeter>();
 
-            this.Pumps = new List<RevitPump>();
-            this.Valves = new List<RevitValve>();
             this.Pipes = new List<RevitPipe>();
             this.Translations = new List<RevitTranslation>();
             this.Exchangers = new List<RevitExchanger>();
+            this.Pumps = new List<RevitPump>();
+            this.Valves = new List<RevitValve>();
 
             this.Decorators = new List<RevitDecorator>();
         }
@@ -40,32 +40,28 @@
         {
             this.Name = rhs.Name;
             this.Description = rhs.Description;
-
             this.Reservoirs = rhs.Reservoirs;
             this.Tanks = rhs.Tanks;
             this.Waterboxs = rhs.Waterboxs;
             this.Junctions = rhs.Junctions;
             this.Nozzles = rhs.Nozzles;
             this.Hydrants = rhs.Hydrants;
+            this.Elbows = rhs.Elbows;
+            this.Bluntheads = rhs.Bluntheads;
+            this.Threelinks = rhs.Threelinks;
+            this.Fourlinks = rhs.Fourlinks;
             this.Meters = rhs.Meters;
             this.Flowmeters = rhs.Flowmeters;
             this.Pressmeters = rhs.Pressmeters;
-            this.Elbows = rhs.Elbows;
-            this.Threelinks = rhs.Threelinks;
-            this.Fourlinks = rhs.Fourlinks;
-            this.Bluntheads = rhs.Bluntheads;
-
-            this.Pumps = rhs.Pumps;
-            this.Valves = rhs.Valves;
             this.Pipes = rhs.Pipes;
             this.Translations = rhs.Translations;
             this.Exchangers = rhs.Exchangers;
-
+            this.Pumps = rhs.Pumps;
+            this.Valves = rhs.Valves;
             this.Decorators = rhs.Decorators;
         }
 
-
-        #region 鍩虹淇℃伅
+        #region 鍩虹
 
         /// <summary>
         /// 鍚嶇О
@@ -79,7 +75,7 @@
 
         #endregion
 
-        #region Node
+        #region 鑺傜偣
 
         /// <summary>
         /// 姘村簱鍒楄〃
@@ -149,7 +145,7 @@
 
         #endregion
 
-        #region Link
+        #region 绠℃
 
         /// <summary>
         /// 姘存车鍒楄〃

--
Gitblit v1.9.3