From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
index 7055892..a4ebcc0 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
@@ -90,5 +90,15 @@
[ExporterHeader(DisplayName = "绔欏彴鐘舵��")]
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴鐘舵��")]
public string Status { get; set; } = "Active";
+
+
+ /// <summary>
+ /// 鐢熶骇浜х嚎
+ /// </summary>
+ [ImporterHeader(Name = "鐢熶骇浜х嚎")]
+ [ExporterHeader(DisplayName = "鐢熶骇浜х嚎")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐢熶骇浜х嚎")]
+ public string ProductionLine { get; set; }
+
}
}
--
Gitblit v1.9.3