From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/02-model/05-Sprinkler/AssetsSprinklerMain.cs | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/AssetsElbowMain.cs b/Service/HStation.Service.Assets.Core/02-model/05-Sprinkler/AssetsSprinklerMain.cs
similarity index 79%
copy from Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/AssetsElbowMain.cs
copy to Service/HStation.Service.Assets.Core/02-model/05-Sprinkler/AssetsSprinklerMain.cs
index 1b56088..5368150 100644
--- a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/AssetsElbowMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/05-Sprinkler/AssetsSprinklerMain.cs
@@ -1,45 +1,44 @@
-锘縰sing HStation.Assets;
-using Yw.Model;
+锘縰sing Yw.Model;
namespace HStation.Model
{
/// <summary>
/// 涓氬姟绔�
/// </summary>
- [SysType("assets_elbow_main")]
- public class AssetsElbowMain : BaseModel, ISorter, System.ICloneable
+ [SysType("assets_sprinkler_main")]
+ public class AssetsSprinklerMain : BaseModel, ISorter, System.ICloneable
{
/// <summary>
///
/// </summary>
- public AssetsElbowMain()
+ public AssetsSprinklerMain()
{ }
- public AssetsElbowMain(AssetsElbowMain rhs) : base(rhs)
+ public AssetsSprinklerMain(AssetsSprinklerMain rhs) : base(rhs)
{
- this.Name = rhs.Name;
this.SeriesID = rhs.SeriesID;
- this.Caliber = rhs.Caliber;
- this.Material = rhs.Material;
- this.Angle = rhs.Angle;
+ this.Name = rhs.Name;
this.MinorLoss = rhs.MinorLoss;
- this.ElbowLengthType = rhs.ElbowLengthType;
+ this.Caliber = rhs.Caliber;
+ this.Angle = rhs.Angle;
+ this.Material = rhs.Material;
this.KeyWord = rhs.KeyWord;
+ this.FlowMinorLoss = rhs.FlowMinorLoss;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
- public void Reset(AssetsElbowMain rhs)
+ public void Reset(AssetsSprinklerMain rhs)
{
this.ID = rhs.ID;
- this.Name = rhs.Name;
this.SeriesID = rhs.SeriesID;
- this.Caliber = rhs.Caliber;
- this.Material = rhs.Material;
- this.Angle = rhs.Angle;
+ this.Name = rhs.Name;
this.MinorLoss = rhs.MinorLoss;
- this.ElbowLengthType = rhs.ElbowLengthType;
+ this.Caliber = rhs.Caliber;
+ this.Angle = rhs.Angle;
+ this.Material = rhs.Material;
this.KeyWord = rhs.KeyWord;
+ this.FlowMinorLoss = rhs.FlowMinorLoss;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -60,9 +59,9 @@
public double? Caliber { get; set; }
/// <summary>
- /// 绠¤矾杩炴帴闀垮害
+ /// 鏉愭枡
/// </summary>
- public eLengthType? ElbowLengthType { get; set; }
+ public string Material { get; set; }
/// <summary>
/// 瑙掑害
@@ -70,19 +69,19 @@
public int? Angle { get; set; }
/// <summary>
- /// 鏉愭枡
- /// </summary>
- public string Material { get; set; }
-
- /// <summary>
- /// 绯绘暟
+ /// 鍠峰皠绯绘暟
/// </summary>
public double MinorLoss { get; set; }
/// <summary>
+ /// 娴侀噺绯绘暟
+ /// </summary>
+ public double? FlowMinorLoss { get; set; }
+
+ /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
- public string KeyWord { get; set; }
+ public List<string> KeyWord { get; set; }
/// <summary>
/// 鎺掑簭鐮�
--
Gitblit v1.9.3