Merge branch 'master' into csc

chengsc

2024-10-18 1e26a7575d9969e728b0aa01466f490409cb173c

 Wms/Model/ModelDto/DataDto/MateDataStockDto.cs

@@ -192,12 +192,12 @@
        /// <summary>
        /// Desc:数量
        /// </summary>           
        public int Qty { get; set; }
        public decimal Qty { get; set; }

        /// <summary>
        /// Desc:整箱数量
        /// </summary>           
        public int? FullQty { get; set; }
        public decimal? FullQty { get; set; }

        /// <summary>
        /// Desc:状态