From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
index 4ef74ba..05405f8 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDetailDto.cs
@@ -96,6 +96,11 @@
public string IsBelt { get; set; }
/// <summary>
+ /// 鏄惁鎺ュ彈鎷肩
+ /// </summary>
+ public string IsMixBox { get; set; }
+
+ /// <summary>
/// Desc:渚涜揣鎵规
/// </summary>
public string SupplierLot { get; set; }
--
Gitblit v1.8.0