Merge branch 'master' of https://git.zhongjie51.com/zhongjie51/99ditui

src/platform/ZhonTai.Admin/Domain/Notice/NoticeEntity.cs

@@ -21,7 +21,7 @@ namespace ZhonTai.Admin.Domain.Notice
         /// 内容
         /// </summary>
         [Column(DbType ="text")]
-        public string Context { get; set; }
+        public string Content { get; set; }
         /// <summary>
         /// 排序 越大越靠前
         /// </summary>        

src/platform/ZhonTai.Admin/Services/Notice/Dto/NoticeAddInput.cs

@@ -16,7 +16,7 @@ namespace ZhonTai.Admin.Services.Notice.Dto
         /// <summary>
         /// 内容
         /// </summary>        
-        public string Context { get; set; }
+        public string Content { get; set; }
         /// <summary>
         /// 排序 越大越靠前
         /// </summary>        
@@ -25,5 +25,9 @@ namespace ZhonTai.Admin.Services.Notice.Dto
         /// 是否弹窗 1弹窗 0不弹窗
         /// </summary>
         public int IsAlter { get; set; } = 0;
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string Tags { get; set; }
     }
 }

src/platform/ZhonTai.Admin/Services/Notice/Dto/NoticeListOutput.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ZhonTai.Admin.Services.Notice.Dto
-{
-    public class NoticeListOutput
-    {
-        public long Id { get; set; }
-        /// <summary>
-        /// 公告标题
-        /// </summary>
-        public string Title { get; set; }
-        /// <summary>
-        /// 内容
-        /// </summary>        
-        public string Context { get; set; }
-        /// <summary>
-        /// 排序 越大越靠前
-        /// </summary>        
-        public int Rank { get; set; }
-        /// <summary>
-        /// 是否弹窗 1弹窗 0不弹窗
-        /// </summary>
-        public int IsAlter { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public DateTime? CreatedTime { get; set; }
-    }
-}

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2577,7 +2577,7 @@
             公告标题
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Notice.NoticeEntity.Context">
+        <member name="P:ZhonTai.Admin.Domain.Notice.NoticeEntity.Content">
             <summary>
             内容
             </summary>
@@ -6013,7 +6013,7 @@
             公告标题
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeAddInput.Context">
+        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeAddInput.Content">
             <summary>
             内容
             </summary>        
@@ -6028,15 +6028,15 @@
             是否弹窗 1弹窗 0不弹窗
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeListOutput.Title">
+        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeAddInput.Tags">
             <summary>
-            公告标题
+            标签
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeListOutput.Context">
+        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeListOutput.Title">
             <summary>
-            内容
-            </summary>        
+            公告标题
+            </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeListOutput.Rank">
             <summary>