Merge branch 'master' into wxw

Administrator

2024-02-04 415c17f207966603c4c60c408f0e0bfdc3763ca7

 Wms/WMS.Entity/DataEntity/DataStockDetail.cs

@@ -58,14 +58,14 @@
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? Qty {get;set;}
        public decimal? Qty {get;set;}

        /// <summary>
        /// Desc:锁定数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? LockQty {get;set;}
        public decimal? LockQty {get;set;}

        /// <summary>
        /// Desc:冻结数量