Merge branch 'net5.0'

ZR.Model/System/Dto/CommonLangDto.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 多语言配置输入对象
+    /// </summary>
+    public class CommonLangDto
+    {
+        [Required(ErrorMessage = "id不能为空")]
+        public long Id { get; set; }
+        //[Required(ErrorMessage = "语言code不能为空")]
+        public string LangCode { get; set; }
+        public string LangKey { get; set; }
+        [Required(ErrorMessage = "名称不能为空")]
+        public string LangName { get; set; }
+        public string LangNameEn { get; set; }
+        public string LangNameTw { get; set; }
+        //public List<CommonLangDto> Langs { get; set; }
+    }
+
+    /// <summary>
+    /// 多语言配置查询对象
+    /// </summary>
+    public class CommonLangQueryDto : PagerInfo 
+    {
+        public string LangCode { get; set; }
+        public string LangKey { get; set; }
+        public DateTime? BeginAddtime { get; set; }
+        public DateTime? EndAddtime { get; set; }
+        public int ShowMode { get; set; }
+    }
+}

ZR.Model/System/Dto/MenuDto.cs

@@ -68,5 +68,9 @@ namespace ZR.Model.System.Dto
         /// 菜单图标
         /// </summary>
         public string icon { get; set; } = string.Empty;
+        /// <summary>
+        /// 翻译key
+        /// </summary>
+        public string MenuNameKey { get; set; }
     }
 }