From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs |   10 ++++++++++
 1 files changed, 10 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 a4b8c8a..c998258 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -20,6 +20,11 @@
     public virtual long PlcId { get; set; }
 
     /// <summary>
+    /// 浜や簰绫诲瀷
+    /// </summary>
+    public virtual DeviceTypeEnum DeviceType { get; set; }
+
+    /// <summary>
     /// 璁惧绾у埆
     /// </summary>
     public virtual DeviceLevelEnum Level { get; set; }
@@ -138,6 +143,11 @@
     /// </summary>
     [Required(ErrorMessage = "PlcId涓嶈兘涓虹┖")]
     public override long PlcId { get; set; }
+    /// <summary>
+    /// 浜や簰绫诲瀷
+    /// </summary>
+    [Required(ErrorMessage = "浜や簰绫诲瀷涓嶈兘涓虹┖")]
+    public override DeviceTypeEnum DeviceType { get; set; }
 
     /// <summary>
     /// 璁惧绾у埆

--
Gitblit v1.8.0