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

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

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

@@ -0,0 +1,21 @@
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 库房业务更新输入参数
+    /// </summary>
+    public class MaterialTransferGetMaterialInventoryInput
+    {
+        /// <summary>
+        /// 托盘数
+        /// </summary>
+        public int palletCount { get; set; }
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public string? material_id { get; set; }
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+    }
+}