From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtBoxingInfo.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtBoxingInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtBoxingInfo.cs
index ec24849..7cc810a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtBoxingInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtBoxingInfo.cs
@@ -35,6 +35,18 @@
public string Remark { get; set; }
/// <summary>
+ /// 褰撳墠宸ュ簭
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "褰撳墠宸ュ簭")]
+ public string ProcessCode { get; set; }
+
+ /// <summary>
+ /// 涓嬩竴宸ュ簭
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "涓嬩竴宸ュ簭")]
+ public string NextProcessCode { get; set; }
+
+ /// <summary>
/// 搴撳瓨鏄庣粏
/// </summary>
[MinItemsCount(1)] // 妫�娴嬮泦鍚堝厓绱犳渶灏�1涓�
--
Gitblit v1.9.3