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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.part.cs

@@ -0,0 +1,18 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 载具台账主表
+/// </summary>
+public partial class WmsCarryH
+{
+	/// <summary>
+	/// 是否签收
+	/// </summary>
+	[SugarColumn(IsIgnore = true)]
+	public int is_sign { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs

@@ -157,5 +157,9 @@ public partial class WmsPretaskH : BaseEntity<string>
     /// 优先级
     /// </summary>
     public int priority { get; set; } = 1;
+    /// <summary>
+    /// 优先级
+    /// </summary>
+    public int is_sign { get; set; } = 1;
 
 }