From bebfcf25bea32eb6d61e1da608adf72e15b3665f Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 28 八月 2024 13:24:32 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
index 69db2d1..96cd826 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
@@ -115,5 +115,6 @@
public PLCUtil PLCUtil { get; set; }
- public List<WcsStation> listStation { get; set; }
+ public List<WcsDevice> listDevice { get; set; }
+ public List<WcsPosition> listStation { get; set; }
}
--
Gitblit v1.8.0