ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -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; }
			}
			}