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/Entity/WcsDevice.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsDevice.cs b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
index fec62ff..37eb5ce 100644
--- a/Admin.NET/WCS.Application/Entity/WcsDevice.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsDevice.cs
@@ -85,4 +85,9 @@
/// </summary>
[SugarColumn(IsIgnore = true)]
public int BoxHeight { get; set; }
+ /// <summary>
+ /// 鐩殑宸ヤ綅
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string EndLocat { get; set; }
}
--
Gitblit v1.8.0