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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCallBackInput.cs

@@ -28,6 +28,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// 取货/放货
         /// </summary>
         public string action { get; set; }
+       
 
 
     }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskChainCallBackInput.cs

@@ -12,6 +12,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// 状态
         /// </summary>
         public string status { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string deviceID { get; set; }
 
 
     }