合并

BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs

@@ -125,5 +125,5 @@ public partial class BasLocation : BaseEntity<string>
     /// <summary>
     /// 是否超配(1：不超配 2：超配)
     /// </summary>
-    public string is_overmatch { get; set; } = "1";
+    public string is_overmatch { get; set; }
 }

BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs

@@ -263,10 +263,5 @@ public partial class BasMaterial : BaseEntity<string>
     /// DI编码
     /// </summary>
     public string? di { get; set; }
-    
-    /// <summary>
-    /// 删除标志
-    /// </summary>
-    public int? deleted { get; set; }
 
 }

BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs

@@ -5,7 +5,7 @@ using SqlSugar;
 namespace Tnb.BasicData.Entities;
 
 /// <summary>
-/// 物料入厂规格
+/// 物料入场规格
 /// </summary>
 [SugarTable("bas_material_into_factory_specifications")]
 public partial class BasMaterialIntoFactorySpecifications : BaseEntity<string>