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

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

@@ -1,6 +1,7 @@
 using JNPF.Common.Contracts;
 using JNPF.Common.Security;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Tnb.WarehouseMgr.Entities;
 
@@ -42,7 +43,7 @@ public partial class WmsCarryH : BaseEntity<string>
     /// <summary>
     /// 载具状态
     /// </summary>
-    public string carry_status { get; set; }
+    public int carry_status { get; set; }
 
     /// <summary>
     /// 载具分类ID

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

@@ -13,5 +13,5 @@ public partial class WmsDistaskH
     /// 载具状态
     /// </summary>
     [SugarColumn(IsIgnore = true)]
-    public string carry_status { get; set; }
+    public int carry_status { get; set; }
 }