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/WcsDevice/Dto/WcsDeviceInput.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
index 8bcd3a2..ff1cd39 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -132,6 +132,11 @@
public string? StationNum { get; set; }
/// <summary>
+ /// 浜や簰绫诲瀷
+ /// </summary>
+ public DeviceTypeEnum? DeviceType { get; set; }
+
+ /// <summary>
/// 鎻忚堪
/// </summary>
public string? Text { get; set; }
@@ -361,6 +366,16 @@
/// </summary>
public string EndCeng { get; set; }
+
+ /// <summary>
+ /// 缂犺啘浜や簰
+ /// </summary>
+ public string ChanMo { get; set; }
+ /// <summary>
+ /// 鎷嗘ā浜や簰
+ /// </summary>
+ public string ChaiMo { get; set; }
+
}
public class WcsDeviceStartStop
--
Gitblit v1.8.0