Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

ZR.Model/MES/wms/WmInfo.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace ZR.Model.MES.wms
+{
+    /// <summary>
+    /// 仓库信息
+    ///</summary>
+    [SugarTable("wm_info")]
+    public class WmInfo
+    {
+        /// <summary>
+        /// 主键 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        /// <summary>
+        /// 仓库编号 
+        ///</summary>
+        [SugarColumn(ColumnName = "warehouse_num")]
+        public int? WarehouseNum { get; set; }
+        /// <summary>
+        /// 仓库名称 
+        ///</summary>
+        [SugarColumn(ColumnName = "warehouse")]
+        public string Warehouse { get; set; }
+        /// <summary>
+        /// 货架 
+        ///</summary>
+        [SugarColumn(ColumnName = "shelf")]
+        public string Shelf { get; set; }
+        /// <summary>
+        /// 层号 
+        ///</summary>
+        [SugarColumn(ColumnName = "layer")]
+        public int? Layer { get; set; }
+        /// <summary>
+        /// 库位名称 
+        ///</summary>
+        [SugarColumn(ColumnName = "location")]
+        public string Location { get; set; }
+        /// <summary>
+        /// 创建人 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+        /// <summary>
+        /// 更新人 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_BY")]
+        public string UpdatedBy { get; set; }
+        /// <summary>
+        /// 更新时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+    }
+}