Procházet zdrojové kódy

fix(s0): align barcode and nbr type entities with legacy schema

将 BarCodeNbr / NbrTypeMaster 两张 legacy 表的 Entity 字段 ColumnName
改回真实 PascalCase 列名(Domain / NbrType / NbrClass / Descr1 / Customer / Type 等),
使 70 行 NbrTypeMaster + 1 行 BarCodeNbr 历史业务数据可见。

- AdoS0NbrTypeMaster: 业务字段 ColumnName 改 PascalCase;补全 21 个缺失字段
  (Descr2/Acct/SubAcct/Name/Start/Nbr/UserID/Confirm/Tran1-5/Page1-5/
   BusinessID/IsConfirm/IsChanged);加 [IgnoreTable] 防 CodeFirst 再 ALTER;
  移除 ITenantIdFilter(DB tenant_id 列全 NULL);移除 snake_case SugarIndex
- AdoS0BarCodeNbr: 业务字段 ColumnName 改 PascalCase;新增 ItemNum;
  字段长度对齐 DB(FirmString* 100→20 等);加 [IgnoreTable];移除 SugarIndex
- C# 属性名保留(DomainCode/NbrType/Customer/Type 等),前端 camelCase
  字段名零破坏,DTO / Controller / 前端无需改动
- 保留 company_ref_id / factory_ref_id snake_case 映射(Controller 强依赖)
- NumberRuleService 走裸 SQL 不依赖 Entity,路径架构性不受影响
- bump server version 1.0.134 → 1.0.135
YY968XX před 1 dnem
rodič
revize
4ca9ccfa2f

+ 3 - 3
server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -11,9 +11,9 @@
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
     <Copyright>Admin.NET</Copyright>
     <Description>Admin.NET 通用权限开发平台</Description>
-    <AssemblyVersion>1.0.134</AssemblyVersion>
-    <FileVersion>1.0.134</FileVersion>
-    <Version>1.0.134</Version>
+    <AssemblyVersion>1.0.135</AssemblyVersion>
+    <FileVersion>1.0.135</FileVersion>
+    <Version>1.0.135</Version>
   </PropertyGroup>
 
   <ItemGroup>

+ 56 - 50
server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Warehouse/AdoS0BarCodeNbr.cs

@@ -1,13 +1,16 @@
 namespace Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
 
 /// <summary>
-/// 条码规则主数据(复刻 BarCodeNbr)
+/// 条码规则主数据(复刻 BarCodeNbr)。
+/// DB 存在新旧两套列:业务真实数据落在旧 PascalCase 列;snake_case 列由历史 CodeFirst 阶段补加但当前唯一 1 行全空。
+/// 本 Entity 将业务字段 ColumnName 改回 DB 真实 PascalCase 列;组织字段保留 snake_case 映射。
+/// 加 [IgnoreTable] 防止 CodeFirst 继续 ALTER;移除 snake_case 唯一索引(DB 现有索引保持不变)。
 /// </summary>
+[IgnoreTable]
 [SugarTable("BarCodeNbr", "条码规则主数据(复刻 BarCodeNbr)")]
-[SugarIndex("uk_BarCodeNbr_domain_customer_type", nameof(DomainCode), OrderByType.Asc, nameof(Customer), OrderByType.Asc, nameof(Type), OrderByType.Asc, IsUnique = true)]
 public class AdoS0BarCodeNbr
 {
-    [SugarColumn(ColumnName = "rec_id", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "RecID", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true)]
     public long Id { get; set; }
 
     [SugarColumn(ColumnName = "company_ref_id", ColumnDescription = "关联公司 ID", ColumnDataType = "bigint")]
@@ -16,85 +19,88 @@ public class AdoS0BarCodeNbr
     [SugarColumn(ColumnName = "factory_ref_id", ColumnDescription = "关联工厂 ID", ColumnDataType = "bigint")]
     public long FactoryRefId { get; set; }
 
-    [SugarColumn(ColumnName = "domain_code", ColumnDescription = "工厂域编码", Length = 50)]
+    [SugarColumn(ColumnName = "Domain", ColumnDescription = "工厂域编码", Length = 8, IsNullable = true)]
     public string DomainCode { get; set; } = string.Empty;
 
-    [SugarColumn(ColumnName = "customer", ColumnDescription = "客户/供应商编码", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "Customer", ColumnDescription = "客户/供应商编码", Length = 50, IsNullable = true)]
     public string? Customer { get; set; }
 
-    [SugarColumn(ColumnName = "type", ColumnDescription = "条码类型", Length = 50, IsNullable = true)]
+    [SugarColumn(ColumnName = "Type", ColumnDescription = "条码类型", Length = 30, IsNullable = true)]
     public string? Type { get; set; }
 
-    [SugarColumn(ColumnName = "water_rules", ColumnDescription = "流水规则", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "WaterRules", ColumnDescription = "流水规则", Length = 8, IsNullable = true)]
     public string? WaterRules { get; set; }
 
-    [SugarColumn(ColumnName = "water_len", ColumnDescription = "流水长度", IsNullable = true)]
+    [SugarColumn(ColumnName = "WaterLen", ColumnDescription = "流水长度", IsNullable = true)]
     public int? WaterLen { get; set; }
 
-    [SugarColumn(ColumnName = "separator", ColumnDescription = "分隔符", Length = 20, IsNullable = true)]
+    [SugarColumn(ColumnName = "Separator", ColumnDescription = "分隔符", Length = 8, IsNullable = true)]
     public string? Separator { get; set; }
 
-    [SugarColumn(ColumnName = "firm_length", ColumnDescription = "固定长度", IsNullable = true)]
+    [SugarColumn(ColumnName = "FirmLength", ColumnDescription = "固定长度", IsNullable = true)]
     public int? FirmLength { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string1", Length = 100, IsNullable = true)] public string? FirmString1 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len1", IsNullable = true)] public int? FirmStringLen1 { get; set; }
-    [SugarColumn(ColumnName = "firm_string1_note", Length = 200, IsNullable = true)] public string? FirmString1Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString1", Length = 20, IsNullable = true)] public string? FirmString1 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen1", IsNullable = true)] public int? FirmStringLen1 { get; set; }
+    [SugarColumn(ColumnName = "FirmString1Note", Length = 30, IsNullable = true)] public string? FirmString1Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string2", Length = 100, IsNullable = true)] public string? FirmString2 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len2", IsNullable = true)] public int? FirmStringLen2 { get; set; }
-    [SugarColumn(ColumnName = "firm_string2_note", Length = 200, IsNullable = true)] public string? FirmString2Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString2", Length = 20, IsNullable = true)] public string? FirmString2 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen2", IsNullable = true)] public int? FirmStringLen2 { get; set; }
+    [SugarColumn(ColumnName = "FirmString2Note", Length = 30, IsNullable = true)] public string? FirmString2Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string3", Length = 100, IsNullable = true)] public string? FirmString3 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len3", IsNullable = true)] public int? FirmStringLen3 { get; set; }
-    [SugarColumn(ColumnName = "firm_string3_note", Length = 200, IsNullable = true)] public string? FirmString3Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString3", Length = 20, IsNullable = true)] public string? FirmString3 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen3", IsNullable = true)] public int? FirmStringLen3 { get; set; }
+    [SugarColumn(ColumnName = "FirmString3Note", Length = 30, IsNullable = true)] public string? FirmString3Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string4", Length = 100, IsNullable = true)] public string? FirmString4 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len4", IsNullable = true)] public int? FirmStringLen4 { get; set; }
-    [SugarColumn(ColumnName = "firm_string4_note", Length = 200, IsNullable = true)] public string? FirmString4Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString4", Length = 20, IsNullable = true)] public string? FirmString4 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen4", IsNullable = true)] public int? FirmStringLen4 { get; set; }
+    [SugarColumn(ColumnName = "FirmString4Note", Length = 30, IsNullable = true)] public string? FirmString4Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string5", Length = 100, IsNullable = true)] public string? FirmString5 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len5", IsNullable = true)] public int? FirmStringLen5 { get; set; }
-    [SugarColumn(ColumnName = "firm_string5_note", Length = 200, IsNullable = true)] public string? FirmString5Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString5", Length = 20, IsNullable = true)] public string? FirmString5 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen5", IsNullable = true)] public int? FirmStringLen5 { get; set; }
+    [SugarColumn(ColumnName = "FirmString5Note", Length = 30, IsNullable = true)] public string? FirmString5Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string6", Length = 100, IsNullable = true)] public string? FirmString6 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len6", IsNullable = true)] public int? FirmStringLen6 { get; set; }
-    [SugarColumn(ColumnName = "firm_string6_note", Length = 200, IsNullable = true)] public string? FirmString6Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString6", Length = 20, IsNullable = true)] public string? FirmString6 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen6", IsNullable = true)] public int? FirmStringLen6 { get; set; }
+    [SugarColumn(ColumnName = "FirmString6Note", Length = 30, IsNullable = true)] public string? FirmString6Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string7", Length = 100, IsNullable = true)] public string? FirmString7 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len7", IsNullable = true)] public int? FirmStringLen7 { get; set; }
-    [SugarColumn(ColumnName = "firm_string7_note", Length = 200, IsNullable = true)] public string? FirmString7Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString7", Length = 20, IsNullable = true)] public string? FirmString7 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen7", IsNullable = true)] public int? FirmStringLen7 { get; set; }
+    [SugarColumn(ColumnName = "FirmString7Note", Length = 30, IsNullable = true)] public string? FirmString7Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string8", Length = 100, IsNullable = true)] public string? FirmString8 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len8", IsNullable = true)] public int? FirmStringLen8 { get; set; }
-    [SugarColumn(ColumnName = "firm_string8_note", Length = 200, IsNullable = true)] public string? FirmString8Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString8", Length = 20, IsNullable = true)] public string? FirmString8 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen8", IsNullable = true)] public int? FirmStringLen8 { get; set; }
+    [SugarColumn(ColumnName = "FirmString8Note", Length = 30, IsNullable = true)] public string? FirmString8Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string9", Length = 100, IsNullable = true)] public string? FirmString9 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len9", IsNullable = true)] public int? FirmStringLen9 { get; set; }
-    [SugarColumn(ColumnName = "firm_string9_note", Length = 200, IsNullable = true)] public string? FirmString9Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString9", Length = 20, IsNullable = true)] public string? FirmString9 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen9", IsNullable = true)] public int? FirmStringLen9 { get; set; }
+    [SugarColumn(ColumnName = "FirmString9Note", Length = 30, IsNullable = true)] public string? FirmString9Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string10", Length = 100, IsNullable = true)] public string? FirmString10 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len10", IsNullable = true)] public int? FirmStringLen10 { get; set; }
-    [SugarColumn(ColumnName = "firm_string10_note", Length = 200, IsNullable = true)] public string? FirmString10Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString10", Length = 20, IsNullable = true)] public string? FirmString10 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen10", IsNullable = true)] public int? FirmStringLen10 { get; set; }
+    [SugarColumn(ColumnName = "FirmString10Note", Length = 30, IsNullable = true)] public string? FirmString10Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string11", Length = 100, IsNullable = true)] public string? FirmString11 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len11", IsNullable = true)] public int? FirmStringLen11 { get; set; }
-    [SugarColumn(ColumnName = "firm_string11_note", Length = 200, IsNullable = true)] public string? FirmString11Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString11", Length = 20, IsNullable = true)] public string? FirmString11 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen11", IsNullable = true)] public int? FirmStringLen11 { get; set; }
+    [SugarColumn(ColumnName = "FirmString11Note", Length = 30, IsNullable = true)] public string? FirmString11Note { get; set; }
 
-    [SugarColumn(ColumnName = "firm_string12", Length = 100, IsNullable = true)] public string? FirmString12 { get; set; }
-    [SugarColumn(ColumnName = "firm_string_len12", IsNullable = true)] public int? FirmStringLen12 { get; set; }
-    [SugarColumn(ColumnName = "firm_string12_note", Length = 200, IsNullable = true)] public string? FirmString12Note { get; set; }
+    [SugarColumn(ColumnName = "FirmString12", Length = 20, IsNullable = true)] public string? FirmString12 { get; set; }
+    [SugarColumn(ColumnName = "FirmStringLen12", IsNullable = true)] public int? FirmStringLen12 { get; set; }
+    [SugarColumn(ColumnName = "FirmString12Note", Length = 30, IsNullable = true)] public string? FirmString12Note { get; set; }
 
-    [SugarColumn(ColumnName = "create_user", ColumnDescription = "创建人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "ItemNum", ColumnDescription = "物料编码", Length = 30, IsNullable = true)]
+    public string? ItemNum { get; set; }
+
+    [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "创建人", Length = 24, IsNullable = true)]
     public string? CreateUser { get; set; }
 
-    [SugarColumn(ColumnName = "create_time", ColumnDescription = "创建时间")]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsNullable = true)]
     public DateTime CreateTime { get; set; } = DateTime.Now;
 
-    [SugarColumn(ColumnName = "update_user", ColumnDescription = "更新人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateUser", ColumnDescription = "更新人", Length = 24, IsNullable = true)]
     public string? UpdateUser { get; set; }
 
-    [SugarColumn(ColumnName = "update_time", ColumnDescription = "更新时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateTime", ColumnDescription = "更新时间", IsNullable = true)]
     public DateTime? UpdateTime { get; set; }
 
     /// <summary>列表展示:供应商简称(不落库,来自 SuppMaster 关联)</summary>

+ 63 - 17
server/Plugins/Admin.NET.Plugin.AiDOP/Entity/S0/Warehouse/AdoS0NbrTypeMaster.cs

@@ -1,13 +1,17 @@
 namespace Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
 
 /// <summary>
-/// 单号类型主数据(复刻 NbrTypeMaster)
+/// 单号类型主数据(复刻 NbrTypeMaster)。
+/// DB 存在新旧两套列:业务真实数据落在旧 PascalCase 列;snake_case 列由历史 CodeFirst 阶段补加但全空。
+/// 本 Entity 将业务字段 ColumnName 改回 DB 真实 PascalCase 列,使 70 行历史数据可见;
+/// 组织 / 审计字段保留 snake_case 列映射(Controller 写入路径仍走 company_ref_id / factory_ref_id)。
+/// 加 [IgnoreTable] 防止 CodeFirst 继续 ALTER 表结构;旧 ITenantIdFilter 移除(tenant_id 列 70 行全 NULL,无业务过滤价值)。
 /// </summary>
+[IgnoreTable]
 [SugarTable("NbrTypeMaster", "单号类型主数据(复刻 NbrTypeMaster)")]
-[SugarIndex("uk_NbrTypeMaster_domain_nbrtype", nameof(DomainCode), OrderByType.Asc, nameof(NbrType), OrderByType.Asc, IsUnique = true)]
-public class AdoS0NbrTypeMaster : ITenantIdFilter
+public class AdoS0NbrTypeMaster
 {
-    [SugarColumn(ColumnName = "rec_id", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true, ColumnDataType = "bigint")]
+    [SugarColumn(ColumnName = "RecID", ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true)]
     public long Id { get; set; }
 
     [SugarColumn(ColumnName = "company_ref_id", ColumnDescription = "关联公司 ID", ColumnDataType = "bigint")]
@@ -16,40 +20,82 @@ public class AdoS0NbrTypeMaster : ITenantIdFilter
     [SugarColumn(ColumnName = "factory_ref_id", ColumnDescription = "关联工厂 ID", ColumnDataType = "bigint")]
     public long FactoryRefId { get; set; }
 
-    [SugarColumn(ColumnName = "domain_code", ColumnDescription = "工厂域编码", Length = 50)]
+    [SugarColumn(ColumnName = "Domain", ColumnDescription = "工厂域编码", Length = 8, IsNullable = true)]
     public string DomainCode { get; set; } = string.Empty;
 
-    [SugarColumn(ColumnName = "dept", ColumnDescription = "部门编码", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "Dept", ColumnDescription = "部门编码", Length = 8, IsNullable = true)]
     public string? Dept { get; set; }
 
-    [SugarColumn(ColumnName = "nbr_class", ColumnDescription = "单号分类", Length = 50, IsNullable = true)]
+    [SugarColumn(ColumnName = "NbrClass", ColumnDescription = "单号分类", Length = 4, IsNullable = true)]
     public string? NbrClass { get; set; }
 
-    [SugarColumn(ColumnName = "nbr_type", ColumnDescription = "单号类型编码", Length = 100)]
+    [SugarColumn(ColumnName = "NbrType", ColumnDescription = "单号类型编码", Length = 8, IsNullable = true)]
     public string NbrType { get; set; } = string.Empty;
 
-    [SugarColumn(ColumnName = "descr1", ColumnDescription = "类型描述", Length = 255, IsNullable = true)]
+    [SugarColumn(ColumnName = "Descr1", ColumnDescription = "类型描述 1", Length = 24, IsNullable = true)]
     public string? Descr1 { get; set; }
 
-    [SugarColumn(ColumnName = "is_active", ColumnDescription = "是否启用", ColumnDataType = "boolean")]
+    [SugarColumn(ColumnName = "Descr2", ColumnDescription = "类型描述 2", Length = 24, IsNullable = true)]
+    public string? Descr2 { get; set; }
+
+    [SugarColumn(ColumnName = "Acct", ColumnDescription = "科目", Length = 8, IsNullable = true)]
+    public string? Acct { get; set; }
+
+    [SugarColumn(ColumnName = "SubAcct", ColumnDescription = "子科目", Length = 8, IsNullable = true)]
+    public string? SubAcct { get; set; }
+
+    [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 24, IsNullable = true)]
+    public string? Name { get; set; }
+
+    [SugarColumn(ColumnName = "Start", ColumnDescription = "流水起始值", IsNullable = true)]
+    public int? Start { get; set; }
+
+    [SugarColumn(ColumnName = "Nbr", ColumnDescription = "当前流水值", Length = 12, IsNullable = true)]
+    public string? Nbr { get; set; }
+
+    [SugarColumn(ColumnName = "UserID", ColumnDescription = "操作人 ID", Length = 12, IsNullable = true)]
+    public string? UserID { get; set; }
+
+    [SugarColumn(ColumnName = "Confirm", ColumnDescription = "确认标记", IsNullable = true)]
+    public bool? Confirm { get; set; }
+
+    [SugarColumn(ColumnName = "Tran1", Length = 50, IsNullable = true)] public string? Tran1 { get; set; }
+    [SugarColumn(ColumnName = "Tran2", Length = 50, IsNullable = true)] public string? Tran2 { get; set; }
+    [SugarColumn(ColumnName = "Tran3", Length = 50, IsNullable = true)] public string? Tran3 { get; set; }
+    [SugarColumn(ColumnName = "Tran4", Length = 50, IsNullable = true)] public string? Tran4 { get; set; }
+    [SugarColumn(ColumnName = "Tran5", Length = 50, IsNullable = true)] public string? Tran5 { get; set; }
+
+    [SugarColumn(ColumnName = "Page1", Length = 50, IsNullable = true)] public string? Page1 { get; set; }
+    [SugarColumn(ColumnName = "Page2", Length = 50, IsNullable = true)] public string? Page2 { get; set; }
+    [SugarColumn(ColumnName = "Page3", Length = 50, IsNullable = true)] public string? Page3 { get; set; }
+    [SugarColumn(ColumnName = "Page4", Length = 50, IsNullable = true)] public string? Page4 { get; set; }
+    [SugarColumn(ColumnName = "Page5", Length = 50, IsNullable = true)] public string? Page5 { get; set; }
+
+    [SugarColumn(ColumnName = "BusinessID", ColumnDescription = "业务 ID", IsNullable = true)]
+    public long? BusinessID { get; set; }
+
+    [SugarColumn(ColumnName = "IsActive", ColumnDescription = "是否启用", IsNullable = true)]
     public bool IsActive { get; set; } = true;
 
-    [SugarColumn(ColumnName = "create_user", ColumnDescription = "创建人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "IsConfirm", ColumnDescription = "是否已确认", IsNullable = true)]
+    public bool? IsConfirm { get; set; }
+
+    [SugarColumn(ColumnName = "IsChanged", ColumnDescription = "是否已变更", IsNullable = true)]
+    public bool? IsChanged { get; set; }
+
+    [SugarColumn(ColumnName = "CreateUser", ColumnDescription = "创建人", Length = 24, IsNullable = true)]
     public string? CreateUser { get; set; }
 
-    [SugarColumn(ColumnName = "create_time", ColumnDescription = "创建时间")]
+    [SugarColumn(ColumnName = "CreateTime", ColumnDescription = "创建时间", IsNullable = true)]
     public DateTime CreateTime { get; set; } = DateTime.Now;
 
-    [SugarColumn(ColumnName = "update_user", ColumnDescription = "更新人", Length = 100, IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateUser", ColumnDescription = "更新人", Length = 24, IsNullable = true)]
     public string? UpdateUser { get; set; }
 
-    [SugarColumn(ColumnName = "update_time", ColumnDescription = "更新时间", IsNullable = true)]
+    [SugarColumn(ColumnName = "UpdateTime", ColumnDescription = "更新时间", IsNullable = true)]
     public DateTime? UpdateTime { get; set; }
 
     /// <summary>列表展示:部门说明(不落库,来自 DepartmentMaster 关联)</summary>
     [SugarColumn(IsIgnore = true)]
     public string? DeptDescr { get; set; }
-
-    [SugarColumn(ColumnName = "tenant_id", IsNullable = true)]
-    public long? TenantId { get; set; }
 }