From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
index 6eaa5e1..11f5067 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
@@ -19,6 +19,11 @@
/// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
+ public virtual string StationNum { get; set; }
+
+ /// <summary>
+ /// 鎶ヨ缂栧彿
+ /// </summary>
public virtual string AlarmCode { get; set; }
/// <summary>
@@ -143,6 +148,12 @@
public override int PlcPort { get; set; }
/// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ [Required(ErrorMessage = "宸ヤ綅鍙蜂笉鑳戒负绌�")]
+ public override string StationNum { get; set; }
+
+ /// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
[Required(ErrorMessage = "鎶ヨ缂栧彿涓嶈兘涓虹┖")]
--
Gitblit v1.8.0