From d9e59ed2e947aff29b7c21a9b0e8b6e12d741692 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 30 八月 2024 14:54:18 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
index 1244ff8..3dde306 100644
--- a/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
@@ -20,7 +20,14 @@
[Required]
[SugarColumn(ColumnName = "PlcPort", ColumnDescription = "PLCIP鍦板潃")]
public int PlcPort { get; set; }
-
+
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "StationNum", ColumnDescription = "宸ヤ綅鍙�", Length = 4)]
+ public string StationNum { get; set; }
+
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
--
Gitblit v1.8.0