From 94a1a7574f7ce3c61148742cb6f8e6c60a4ed3aa Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期一, 28 四月 2025 17:19:53 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs b/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
index 4f7ae77..ecc7f62 100644
--- a/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsStorageLocat.cs
@@ -126,7 +126,7 @@
public string? AisleTwo { get; set; }
/// <summary>
- /// 鍌ㄤ綅绫诲瀷 1鍌ㄤ綅 0閫氶亾
+ /// 鍌ㄤ綅绫诲瀷 1瀛愰�氶亾 0涓婚�氶亾 2 杈撻�佺嚎鍙�
/// </summary>
[SugarColumn(ColumnName = "Make", ColumnDescription = "鍌ㄤ綅绫诲瀷", Length = 32)]
public string? Make { get; set; }
--
Gitblit v1.8.0