From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新

---
 项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
index 7c05350..aa15472 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
@@ -15,7 +15,11 @@
         /// 涓婚敭
         /// </summary>
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+<<<<<<< HEAD
         public int id { get; set; }
+=======
+        public int Id { get; set; }
+>>>>>>> main
 
         /// <summary>
         /// 璁惧缂栧彿
@@ -39,7 +43,11 @@
         /// 鐮佸灈鏁伴噺
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鏁伴噺")]
+<<<<<<< HEAD
         public int PackNum { get; set; }
+=======
+        public int PackNum { get; set; } = 0;
+>>>>>>> main
 
         /// <summary>
         /// X鍧愭爣
@@ -98,7 +106,11 @@
         /// <summary>
         /// 澶囨敞
         /// </summary>
+<<<<<<< HEAD
         [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "澶囨敞")]
+=======
+        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
+>>>>>>> main
         public string Remark { get; set; }
     }
 }

--
Gitblit v1.9.3