Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Conflicts: BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
2024-05-24 14:33:09 +08:00
parent 36622b35cf 86d07260af
commit fc74b3381f
6 changed files with 172 additions and 18 deletions
--- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
+++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
@@ -269,9 +269,13 @@ public partial class BasMaterial : BaseEntity<string>
    /// </summary>
    public int? deleted { get; set; }

+    /// <summary>
+    /// 箱号
+    /// </summary>
+    public string container_no { get; set; }
+
    /// <summary>
    /// 规格型号
    /// </summary>
    public string? material_specification { get; set; }
-    
 }