From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/PumpSeries.cs b/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs
similarity index 83%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/PumpSeries.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs
index 6711281..68829df 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/PumpSeries.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs
@@ -21,7 +21,6 @@
         /// </summary>
         public AssetsPumpSeries(AssetsPumpSeries rhs) : base(rhs)
         {
-            this.ParentIds = rhs.ParentIds;
             this.Name = rhs.Name;
             this.CatalogID = rhs.CatalogID;
             this.Paras = rhs.Paras;
@@ -36,17 +35,6 @@
         /// 鎵�灞炵被鍒獻D
         /// </summary>
         public long CatalogID { get; set; }
-
-        /// <summary>
-        /// 鐖剁骇id鍒楄〃锛堢増鏈帶鍒讹級
-        /// </summary>
-        [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
-        public string ParentIds { get; set; }
-
-        /// <summary>
-        /// 绯诲垪绫诲瀷
-        /// </summary>
-        public ePumpType SeriesType { get; set; }
 
         /// <summary>
         /// 鍚嶇О

--
Gitblit v1.9.3