Merge branch 'master' into djp

test

4 天以前 e9c1fb1cae94c52d2a634f6e21a3a87354b52716

 Wms/WMS.Entity/BllAsnEntity/BllPalletUpShelf.cs

@@ -38,7 +38,7 @@
        /// </summary>
        public string LotNo { get; set; }
        /// <summary>
        /// 状态
        /// 状态 0等待执行 1正在执行 2执行完成 4已取消
        /// </summary>
        public string Status { get; set; }