From 4687427f9a801b8999e8fa7eec48b4377bfe4fc1 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 17:00:57 +0800
Subject: [PATCH] Merge branch 'hwh'

---
 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
index 1cfabf2..e66ea48 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs
@@ -10,102 +10,102 @@
     /// 涓婚敭Id
     /// </summary>
     public long Id { get; set; }
-    
+
     /// <summary>
     /// PlcId
     /// </summary>
-    public long PlcId { get; set; } 
-    
+    public long PlcId { get; set; }
+
     /// <summary>
     /// PlcId 鎻忚堪
     /// </summary>
-    public string PlcIdIP { get; set; } 
-    
+    public string PlcIdIP { get; set; }
+
     /// <summary>
     /// 璁惧绾у埆
     /// </summary>
     public DeviceLevelEnum Level { get; set; }
-    
+
     /// <summary>
     /// DB鍖哄煙
     /// </summary>
     public string? DbNumber { get; set; }
-    
+
     /// <summary>
     /// 宸ヤ綅鍙�
     /// </summary>
     public string? StationNum { get; set; }
-    
+
     /// <summary>
     /// PLC鍋忕Щ閲�
     /// </summary>
     public string? PlcPos { get; set; }
-    
+
     /// <summary>
     /// WCS鍋忕Щ閲�
     /// </summary>
     public string? WcsPos { get; set; }
-    
+
     /// <summary>
     /// 娴佺▼瀛楃被鍨�
     /// </summary>
-    public PLCDataTypeEnum? PosType { get; set; }
-    
+    public PLCDataTypeEnum PosType { get; set; }
+
     /// <summary>
     /// 鏄剧ず灞廼p鍦板潃
     /// </summary>
     public string? LedIP { get; set; }
-    
+
     /// <summary>
     /// 鎻忚堪
     /// </summary>
     public string? Text { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鏃堕棿
     /// </summary>
     public DateTime? CreateTime { get; set; }
-    
+
     /// <summary>
     /// 鏇存柊鏃堕棿
     /// </summary>
     public DateTime? UpdateTime { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰匢d
     /// </summary>
     public long? CreateUserId { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呭鍚�
     /// </summary>
     public string? CreateUserName { get; set; }
-    
+
     /// <summary>
     /// 淇敼鑰匢d
     /// </summary>
     public long? UpdateUserId { get; set; }
-    
+
     /// <summary>
     /// 淇敼鑰呭鍚�
     /// </summary>
     public string? UpdateUserName { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呴儴闂↖d
     /// </summary>
     public long? CreateOrgId { get; set; }
-    
+
     /// <summary>
     /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
     /// </summary>
     public string? CreateOrgName { get; set; }
-    
+
     /// <summary>
     /// 杞垹闄�
     /// </summary>
     public bool IsDelete { get; set; }
-    
-    }
- 
+
+}
+
 

--
Gitblit v1.8.0