From f2392d984123a1402d6c9bab9e5452c7becc8d22 Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
index ae986ce..45580ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
@@ -15,24 +15,36 @@
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+<<<<<<< HEAD
public int id { get; set; }
+=======
+ public int Id { get; set; }
+>>>>>>> main
/// <summary>
/// 鐮佸灈鍨涘瀷闀垮害
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鍨涘瀷闀垮害")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈鍨涘瀷闀垮害")]
public int PackLength { get; set; }
/// <summary>
/// 鐮佸灈鍨涘瀷瀹藉害
/// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐮佸灈鍨涘瀷瀹藉害")]
- public string PackWidth { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈鍨涘瀷瀹藉害")]
+ public int PackWidth { get; set; }
/// <summary>
/// 鐮佸灈鍨涘瀷楂樺害
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鍨涘瀷楂樺害")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈鍨涘瀷楂樺害")]
public int PackHeight { get; set; }
+<<<<<<< HEAD
+=======
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+>>>>>>> main
}
}
--
Gitblit v1.9.3