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/02-model/01-Pump/AssetsPumpType.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpType.cs b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpType.cs
similarity index 83%
rename from Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpType.cs
rename to Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpType.cs
index 5fe66e8..d430b0b 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpType.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpType.cs
@@ -19,19 +19,19 @@
public AssetsPumpType(AssetsPumpType rhs) : base(rhs)
{
this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
this.Name = rhs.Name;
- this.Description = rhs.Description;
- this.BelongTypeID = rhs.BelongTypeID;
this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
}
public void Reset(AssetsPumpType rhs)
{
this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
this.Name = rhs.Name;
- this.Description = rhs.Description;
- this.BelongTypeID = rhs.BelongTypeID;
this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
}
/// <summary>
@@ -40,9 +40,10 @@
public string Name { get; set; }
/// <summary>
- /// 鎵�灞炵被鍨婭D
+ /// 鐖剁骇id鍒楄〃锛堢増鏈帶鍒讹級
/// </summary>
- public long BelongTypeID { get; set; }
+ [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+ public List<long> ParentIds { get; set; }
/// <summary>
/// 鎺掑簭鐮�
--
Gitblit v1.9.3