From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
Dto/HStation.Dto.Assets.Core/04-PipeLine/03-Factor/AssetsPipeFactorStdDto.cs | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/Dto/HStation.Dto.Assets.Core/04-PipeLine/03-Factor/AssetsPipeFactorStdDto.cs b/Dto/HStation.Dto.Assets.Core/04-PipeLine/03-Factor/AssetsPipeFactorStdDto.cs
index 6d3998c..9431cd2 100644
--- a/Dto/HStation.Dto.Assets.Core/04-PipeLine/03-Factor/AssetsPipeFactorStdDto.cs
+++ b/Dto/HStation.Dto.Assets.Core/04-PipeLine/03-Factor/AssetsPipeFactorStdDto.cs
@@ -10,11 +10,9 @@
public AssetsPipeFactorStdDto(Model.AssetsPipeFactor rhs)
{
this.ID = rhs.ID;
- this.PipeLineID = rhs.PipeLineID;
this.Name = rhs.Name;
this.Caliber = rhs.Caliber;
this.Material = rhs.Material;
- this.eAlgorithmType = rhs.eAlgorithmType;
this.StartValue = rhs.StartValue;
this.EndValue = rhs.EndValue;
}
@@ -25,16 +23,6 @@
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
-
- /// <summary>
- /// 绠楁硶绫诲瀷
- /// </summary>
- public eAlgorithmType eAlgorithmType { get; set; }
-
- /// <summary>
- /// 绠￠亾ID
- /// </summary>
- public long PipeLineID { get; set; }
/// <summary>
/// 鍙ｅ緞
--
Gitblit v1.9.3