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/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs | 5 +++++
1 files changed, 5 insertions(+), 0 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..d68c3b6 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; }
--
Gitblit v1.8.0