From 083c4e47c7a59025f3348bd093693c6b3febb014 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 16 十月 2024 10:03:31 +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 | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index 720af6b..70a1dcb 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -46,8 +46,8 @@
this.Junctions = rhs.Junctions;
this.Nozzles = rhs.Nozzles;
this.Hydrants = rhs.Hydrants;
- this.Elbows = rhs.Elbows;
this.Bluntheads = rhs.Bluntheads;
+ this.Elbows = rhs.Elbows;
this.Threelinks = rhs.Threelinks;
this.Fourlinks = rhs.Fourlinks;
this.Meters = rhs.Meters;
@@ -108,6 +108,11 @@
public List<RevitHydrant> Hydrants { get; set; }
/// <summary>
+ /// 闂峰ご鍒楄〃
+ /// </summary>
+ public List<RevitBlunthead> Bluntheads { get; set; }
+
+ /// <summary>
/// 寮ご鍒楄〃
/// </summary>
public List<RevitElbow> Elbows { get; set; }
@@ -121,11 +126,6 @@
/// 鍥涢�氬垪琛�
/// </summary>
public List<RevitFourlink> Fourlinks { get; set; }
-
- /// <summary>
- /// 闂峰ご鍒楄〃
- /// </summary>
- public List<RevitBlunthead> Bluntheads { get; set; }
/// <summary>
/// 姘磋〃
@@ -148,16 +148,6 @@
#region 绠℃
/// <summary>
- /// 姘存车鍒楄〃
- /// </summary>
- public List<RevitPump> Pumps { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ垪琛�
- /// </summary>
- public List<RevitValve> Valves { get; set; }
-
- /// <summary>
/// 绠￠亾鍒楄〃
/// </summary>
public List<RevitPipe> Pipes { get; set; }
@@ -172,6 +162,16 @@
/// </summary>
public List<RevitExchanger> Exchangers { get; set; }
+ /// <summary>
+ /// 姘存车鍒楄〃
+ /// </summary>
+ public List<RevitPump> Pumps { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄥ垪琛�
+ /// </summary>
+ public List<RevitValve> Valves { get; set; }
+
#endregion
#region 瑁呴グ浠�
--
Gitblit v1.9.3