From 5423ea50d00ce05c87ba443413037d86d7669638 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:55:34 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
index 6085886..a02d136 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
@@ -92,6 +92,11 @@
public string OrderCode { get; set; }
/// <summary>
+ /// 鍒跺崟浜�
+ /// </summary>
+ public string UserName { get; set; }
+
+ /// <summary>
/// 澶嶆牳浜�
/// </summary>
public int CheckUser { get; set; }
--
Gitblit v1.8.0