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_Packaxis.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 4cc0027..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"
@@ -6,16 +6,20 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.DB.Models;
-namespace WIDESEAWCS_Model.Models.PackInfo
+namespace WIDESEAWCS_Model.Models
{
- [SugarTable(nameof(Dt_Packaxis), "鐮佸灈鍧愭爣")]
+ [SugarTable(nameof(Dt_Packaxis), "鐮佸灈鍧愭爣琛�")]
public class Dt_Packaxis : BaseEntity
{
/// <summary>
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+<<<<<<< HEAD
public int id { get; set; }
+=======
+ public int Id { get; set; }
+>>>>>>> main
/// <summary>
/// 璁惧缂栧彿
@@ -26,20 +30,24 @@
/// <summary>
/// 绔欏彴缂栧彿
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绔欏彴缂栧彿")]
- public int StationCode { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴缂栧彿")]
+ public string StationCode { get; set; }
/// <summary>
/// 鍨涘瀷
/// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鍨涘瀷")]
- public string PackType { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍨涘瀷")]
+ public int PackType { get; set; }
/// <summary>
/// 鐮佸灈鏁伴噺
/// </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