From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
index 9fab037..cdefd49 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs
@@ -36,7 +36,7 @@
public bool IsFull { get; set; }
/// <summary>
- /// 澶囨敞 (闈欏埗)
+ /// 澶囨敞 (闈欏埗\闄堝寲鏃堕棿)
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
--
Gitblit v1.9.3