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/04-Fourlink/AssetsFourlinkMain.cs | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/03-FourLinkManage/FourLinkMain.cs b/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs
similarity index 76%
rename from Service/HStation.Service.Assets.Core/02-model/03-FourLinkManage/FourLinkMain.cs
rename to Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs
index 5264484..12bd915 100644
--- a/Service/HStation.Service.Assets.Core/02-model/03-FourLinkManage/FourLinkMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs
@@ -14,17 +14,15 @@
public AssetsFourlinkMain()
{ }
- public AssetsFourlinkMain(AssetsFourlinkMain rhs)
+ public AssetsFourlinkMain(AssetsFourlinkMain rhs) : base(rhs)
{
- this.ID = rhs.ID;
+ this.Name = rhs.Name;
this.SeriesID = rhs.SeriesID;
this.KeyWord = rhs.KeyWord;
- this.IsDefault = rhs.IsDefault;
- this.Coefficient = rhs.Coefficient;
+ this.MinorLoss = rhs.MinorLoss;
this.Caliber = rhs.Caliber;
- this.MaterialName = rhs.MaterialName;
+ this.Material = rhs.Material;
this.SortCode = rhs.SortCode;
- this.Name = rhs.Name;
this.Description = rhs.Description;
}
@@ -32,9 +30,9 @@
{
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
- this.Coefficient = rhs.Coefficient;
+ this.MinorLoss = rhs.MinorLoss;
this.Caliber = rhs.Caliber;
- this.MaterialName = rhs.MaterialName;
+ this.Material = rhs.Material;
this.SortCode = rhs.SortCode;
this.Name = rhs.Name;
this.Description = rhs.Description;
@@ -58,27 +56,22 @@
/// <summary>
/// 鏉愭枡
/// </summary>
- public string MaterialName { get; set; }
+ public string Material { get; set; }
/// <summary>
/// 绯绘暟
/// </summary>
- public double? Coefficient { get; set; }
+ public double MinorLoss { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ public List<string> KeyWord { get; set; }
/// <summary>
/// 鎺掑簭鐮�
/// </summary>
public int SortCode { get; set; }
-
- /// <summary>
- /// 璇嗗埆鍏抽敭瀛�
- /// </summary>
- public string KeyWord { get; set; }
-
- /// <summary>
- /// 鏄惁榛樿
- /// </summary>
- public bool IsDefault { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3