From d82252f08a32f5786ffe231b7fd301b6a60781d6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 07 三月 2026 17:56:58 +0800
Subject: [PATCH] 解决代码冲突更新WCS日志记录
---
项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs | 8 --------
1 files changed, 0 insertions(+), 8 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 45580ae..881ee76 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,12 +15,7 @@
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
-<<<<<<< HEAD
- public int id { get; set; }
-=======
public int Id { get; set; }
->>>>>>> main
-
/// <summary>
/// 鐮佸灈鍨涘瀷闀垮害
/// </summary>
@@ -38,13 +33,10 @@
/// </summary>
[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