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/01-entity/05-Sprinkler/AssetsSprinklerSeries.cs | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/04-Sprinkler/SprinklerSeries.cs b/Service/HStation.Service.Assets.Core/01-entity/05-Sprinkler/AssetsSprinklerSeries.cs
similarity index 85%
rename from Service/HStation.Service.Assets.Core/01-entity/04-Sprinkler/SprinklerSeries.cs
rename to Service/HStation.Service.Assets.Core/01-entity/05-Sprinkler/AssetsSprinklerSeries.cs
index 417fc17..795df11 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/04-Sprinkler/SprinklerSeries.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/05-Sprinkler/AssetsSprinklerSeries.cs
@@ -7,7 +7,7 @@
/// </summary>
[SysType("assets_sprinkler_series")]
[SugarTable("assets_sprinkler_series")]
- public class AssetsSprinklerSeries : BaseEntity, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
+ public class AssetsSprinklerSeries : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
@@ -21,15 +21,20 @@
public AssetsSprinklerSeries(AssetsSprinklerSeries rhs) : base(rhs)
{
this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
this.Name = rhs.Name;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
- this.Type = rhs.Type;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
+
+ /// <summary>
+ /// 鐖剁骇id鍒楄〃锛堢増鏈帶鍒讹級
+ /// </summary>
+ [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+ public string ParentIds { get; set; }
/// <summary>
/// 鍚嶇О
@@ -52,19 +57,9 @@
public string TagName { get; set; }
/// <summary>
- /// 浣跨敤鐘舵��
- /// </summary>
- public int UseStatus { get; set; }
-
- /// <summary>
/// 鎺掑簭鐮�
/// </summary>
public int SortCode { get; set; }
-
- /// <summary>
- /// 绫诲瀷
- /// </summary>
- public string Type { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3