From aaeff2d517b26bf2732182e4975f5b1156b752c3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:28 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
index 2c1d3cb..396fd7a 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
@@ -21,6 +21,11 @@
public int PlcPort { get; set; }
/// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public string StationNum { get; set; }
+
+ /// <summary>
/// 鎶ヨ缂栧彿
/// </summary>
public string AlarmCode { get; set; }
@@ -38,7 +43,7 @@
/// <summary>
/// 鐘舵��
/// </summary>
- public int? Status { get; set; }
+ public YesNoEnum? Status { get; set; }
/// <summary>
/// 璁惧绫诲瀷
--
Gitblit v1.8.0