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/WcsDeviceTaskOrderDto.cs |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
index 2f97a92..bb29667 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceTaskOrderDto.cs
@@ -8,6 +8,7 @@
 public class WcsDeviceTaskOrderDto
 {
     public long Id { get; set; }
+    public long TaskId { get; set; }
     public string Text { get; set; }
     public string? TaskNo { get; set; }
     public string? OrderNo { get; set; }

--
Gitblit v1.8.0