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

src/hosts/ZhonTai.Host/Configs/appconfig.json

@@ -110,5 +110,7 @@
     "path": "/admin/health"
   },
   //H5域名
-  "H5WebSite": "http://dev.gl.zjdg.cn/"
+  "H5WebSite": "http://dev.gl.zjdg.cn/",
+  //平台默认抽成比率 5%
+  "TenantRatio": 5
 }

src/platform/ZhonTai.Admin/Core/Configs/AppConfig.cs

@@ -116,6 +116,10 @@ public class AppConfig
     public QCloud QCloudSet { get; set; } = new QCloud();
 
     public InviteUrl InviteUrlSet { get; set; } = new InviteUrl();
+    /// <summary>
+    /// 平台默认抽成比率
+    /// </summary>
+    public decimal TenantRatio { get; set; }
     
 }
 
@@ -387,7 +391,7 @@ public class KuaKeConfig
     /// <summary>
     /// 行业信息
     /// </summary>
-    public string Industry { get; set; }
+    public string Industry { get; set; }    
 }
 
 public class QCloud

src/platform/ZhonTai.Admin/Core/Consts/TaskNames.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZhonTai.Admin.Core.Consts
+{
+    /// <summary>
+    /// 任务常量
+    /// </summary>
+    public static partial class TaskNames
+    {
+        /// <summary>
+        /// 公司抽成生效时间任务
+        /// </summary>
+        public const string CompanyDrawTask = "CompanyDraw";
+    }
+}

src/platform/ZhonTai.Admin/Core/Handlers/AppCustomTaskHandler.cs

@@ -0,0 +1,22 @@
+using FreeScheduler;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZhonTai.Admin.Core.Handlers
+{
+    /// <summary>
+    /// 模块自定义任务处理器
+    /// </summary>
+    public class AppCustomTaskHandler : ITaskIntervalCustomHandler
+    {
+        public TimeSpan? NextDelay(TaskInfo task)
+        {
+            //利用 cron 功能库解析 task.IntervalArgument 得到下一次执行时间
+            //与当前时间相减，得到 TimeSpan，若返回 null 则任务完成
+            return TimeSpan.FromSeconds(5);
+        }
+    }
+}

src/platform/ZhonTai.Admin/Core/Handlers/TaskHandler.cs

@@ -0,0 +1,52 @@
+using FreeScheduler;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Consts;
+using ZhonTai.Admin.Services.Project;
+using ZhonTai.Admin.Tools.TaskScheduler;
+using ZhonTai.Common.Extensions;
+
+namespace ZhonTai.Admin.Core.Handlers
+{
+    /// <summary>
+    /// 模块任务处理器
+    /// </summary>
+    public class TaskHandler : Tools.TaskScheduler.TaskHandler
+    {
+        public TaskHandler(IFreeSql fsql) : base(fsql)
+        {
+
+        }
+
+        /// <summary>
+        /// 公司抽成任务
+        /// </summary>
+        /// <param name="task"></param>
+        private static async Task ModuleTask(TaskInfo task)
+        {
+            using var scope = TaskSchedulerServiceExtensions.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope();
+            var moduleService = scope.ServiceProvider.GetRequiredService<IProjectPriceService>();
+
+            //await moduleService.ExecuteTaskCompanyDraw();            
+            moduleService.ExecuteTaskCompanyDraw();
+        }
+
+        public override void OnExecuting(Scheduler scheduler, TaskInfo task)
+        {
+            switch (task.Topic)
+            {
+                //模块任务
+                case TaskNames.CompanyDrawTask:
+                    Task.Run(async () => {
+                        await ModuleTask(task);
+                    }).Wait();
+                    break;
+            }
+        }
+    }
+}

src/platform/ZhonTai.Admin/Domain/Article/AriticleEntity.cs

@@ -11,7 +11,7 @@ namespace ZhonTai.Admin.Domain.Ariticle
     /// <summary>
     /// 数据字典
     /// </summary>
-    [Table(Name = "ditui_banner")]    
+    [Table(Name = "ditui_article")]    
     public class AriticleEntity:EntityTenant
     {
         /// <summary>
@@ -21,7 +21,13 @@ namespace ZhonTai.Admin.Domain.Ariticle
         /// <summary>
         /// 文章内容
         /// </summary>
-        public string SkipContent { get; set; }       
+        [Column(DbType ="text")]
+        public string Content { get; set; }
+        /// <summary>
+        /// 纯文章内容
+        /// </summary>
+        [Column(DbType = "text")]
+        public string ContentOnly { get; set; }
         /// <summary>
         /// 排序 数值越大越靠前
         /// </summary>

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

@@ -38,6 +38,10 @@ namespace ZhonTai.Admin.Domain.Notice
         /// <summary>
         /// 标签
         /// </summary>
-        public string Tags { get; set; }        
+        public string Tags { get; set; }
+        /// <summary>
+        /// 是否展示 1展示 0不展示
+        /// </summary>
+        public int IsShow { get; set; } = 0;
     }
 }

src/platform/ZhonTai.Admin/Domain/Platform/IUserBillsRepository.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Repositories;
+
+namespace ZhonTai.Admin.Domain.Platform
+{    
+  public interface IUserBillsRepository : IRepositoryBase<UserBillsEntity>
+    {
+
+    }
+}

src/platform/ZhonTai.Admin/Domain/Platform/PlatformUserEntity.cs

@@ -62,6 +62,10 @@ namespace ZhonTai.Admin.Domain.Platform
         /// 抽成比例
         /// </summary>
         public decimal CommissionRatio { get; set; }
+        /// <summary>
+        /// 余额
+        /// </summary>
+        public decimal Amount { get; set; } = 0;
 
 
         /// 通过手机号和上级ID 来判断唯一（一个手机号可注册多个不同上级的账号）

src/platform/ZhonTai.Admin/Domain/Platform/UserBillsEntity.cs

@@ -0,0 +1,50 @@
+using FreeSql.DataAnnotations;
+using System;
+using ZhonTai.Admin.Core.Entities;
+
+namespace ZhonTai.Admin.Domain.Platform
+{  
+    /// <summary>
+    /// 平台用户资金明细
+    /// </summary>
+    [Table(Name = "ditui_platform_user_bills")]
+    public class UserBillsEntity : EntityTenant
+    {
+        /// <summary>
+        /// 类型 1推广佣金 2团队佣金
+        /// </summary>
+        public int BillType { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime EffectDate { get; set; }
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public long UserId { get; set; }
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        public long ProjectId { get; set; }
+        /// <summary>
+        /// 结算标准Id
+        /// </summary>
+        public long PriceId { get; set; }
+        /// <summary>
+        /// 有效数
+        /// </summary>
+        public int ValidCount { get; set; }
+        /// <summary>
+        /// 佣金
+        /// </summary>
+        public decimal Commission { get; set; }
+        /// <summary>
+        /// 变更后金额
+        /// </summary>
+        public decimal AfterAmount { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }               
+    }
+}

src/platform/ZhonTai.Admin/Repositories/Platform/UserBillsRepository.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Db.Transaction;
+using ZhonTai.Admin.Domain.Platform;
+
+namespace ZhonTai.Admin.Repositories.Platform
+{    
+     public class UserBillsRepository : AdminRepositoryBase<UserBillsEntity>, IUserBillsRepository
+    {
+        public UserBillsRepository(UnitOfWorkManagerCloud muowm) : base(muowm)
+        {
+
+        }
+    }
+
+}

src/platform/ZhonTai.Admin/Services/Article/ArticleService.cs

@@ -44,8 +44,10 @@ namespace ZhonTai.Admin.Services.Article
         /// <returns></returns>
         [HttpPost]
         public async Task<PageOutput<AriticleListOutput>> GetPageAsync(PageInput<AriticleGetPageDto> input)
-        {            
-            var list = await _ariticleRepository.Select            
+        {
+            var keyword = input?.Filter.Keyword;
+            var list = await _ariticleRepository.Select
+                .WhereIf(!string.IsNullOrWhiteSpace(keyword),m=>m.Title.Contains(keyword))
             .Count(out var total)
             .OrderByDescending(true, c => c.Rank)
             .OrderByDescending(true, c => c.Id)

src/platform/ZhonTai.Admin/Services/Article/Dto/AriticleAddInput.cs

@@ -15,7 +15,11 @@ namespace ZhonTai.Admin.Services.Article.Dto
         /// <summary>
         /// 文章内容
         /// </summary>
-        public string SkipContent { get; set; }
+        public string Content { get; set; }
+        /// <summary>
+        /// 纯文章内容
+        /// </summary>
+        public string ContentOnly { get; set; }
         /// <summary>
         /// 排序 数值越大越靠前
         /// </summary>

src/platform/ZhonTai.Admin/Services/Article/Dto/AriticleGetOutput.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ZhonTai.Admin.Services.Article.Dto
 {
-    public class AriticleGetOutput
+    public class AriticleGetOutput:AriticleUpdateInput
     {
     }
 }

src/platform/ZhonTai.Admin/Services/Article/Dto/AriticleGetPageDto.cs

@@ -8,5 +8,9 @@ namespace ZhonTai.Admin.Services.Article.Dto
 {
     public class AriticleGetPageDto
     {
+        /// <summary>
+        /// 关键字 文章标题
+        /// </summary>
+        public string Keyword{ get; set; }
     }
 }

src/platform/ZhonTai.Admin/Services/Article/Dto/AriticleListOutput.cs

@@ -8,5 +8,15 @@ namespace ZhonTai.Admin.Services.Article.Dto
 {
     public class AriticleListOutput
     {
+        public long Id { get; set; }
+        /// <summary>
+        /// 文章标题
+        /// </summary>
+        public string Title { get; set; }        
+        /// <summary>
+        /// 排序 数值越大越靠前
+        /// </summary>
+        public int Rank { get; set; }
+        public DateTime CreatedTime { get; set; }
     }
 }

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

@@ -33,5 +33,9 @@ namespace ZhonTai.Admin.Services.Notice.Dto
         /// 纯文本内容
         /// </summary>        
         public string Desc { get; set; }
+        /// <summary>
+        /// 是否展示 1展示 0不展示
+        /// </summary>
+        public int IsShow { get; set; }
     }
 }

src/platform/ZhonTai.Admin/Services/ProjectStat/ProjectStatService.cs

@@ -31,6 +31,8 @@ using ZhonTai.Admin.Domain.KuaKe;
 using ZhonTai.Admin.Domain.Platform;
 using ZhonTai.Admin.Repositories.Platform;
 using StackExchange.Profiling.Data;
+using NPOI.SS.Formula.Functions;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Services.ProjectStat
 {
@@ -51,6 +53,7 @@ namespace ZhonTai.Admin.Services.ProjectStat
         private IProjectConfigRepository _projectConfigRepository => LazyGetRequiredService<IProjectConfigRepository>();
         private IKuaKeRepository _kuaKeRepository => LazyGetRequiredService<IKuaKeRepository>();
         private IPlatformUserRepository _platformUserRepository => LazyGetRequiredService<IPlatformUserRepository>();
+        private IUserBillsRepository _userBillsRepository => LazyGetRequiredService<IUserBillsRepository>();
 
         public ProjectStatService()
         {
@@ -74,6 +77,7 @@ namespace ZhonTai.Admin.Services.ProjectStat
                 .WhereIf(IsSettele.HasValue && IsSettele.Value >= 0, a => a.IsSettle == IsSettele)
                 .WhereIf(EffectDate.HasValue, a => a.EffectDate == EffectDate)
                 .GroupBy(m => new { m.ProjectId, m.TenantId, m.EffectDate })
+                .OrderByDescending(m => m.Key.EffectDate)
             .Count(out var total)
             .Page(input.CurrentPage, input.PageSize)
             .ToList(m => new ProjectStatManagePageOutput()
@@ -327,7 +331,7 @@ namespace ZhonTai.Admin.Services.ProjectStat
                                 CompanyRatio = drawcommission?.CompanyRatio,
                                 TenantCommission = drawcommission.TenantCommission,
                                 TenantyRatio = drawcommission.TenantRatio,
-                                UserRole =UserRole,
+                                UserRole = UserRole,
                             };
                             list.Add(model);
                         }
@@ -477,23 +481,18 @@ namespace ZhonTai.Admin.Services.ProjectStat
         ///<param name="ProjectId">项目Id</param>
         ///<param name="EffecDate">状态 2上架 3下架 4暂停</param>
         /// <returns></returns>    
-        [HttpGet]
+        [HttpGet]        
         public async Task UpdateSettleAsync(long ProjectId, int EffecDate)
         {
-            var count = await _projectStatRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.ProjectId == ProjectId && m.EffectDateNum == EffecDate && m.IsSettle == 0).CountAsync();
-            if (count <= 0)
+            var list = await _projectStatRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.ProjectId == ProjectId && m.EffectDateNum == EffecDate && m.IsSettle == 0).ToListAsync();
+            if (list.Count <= 0)
             {
                 throw ResultOutput.Exception("无可结算数据");
             }
-            //更新项目            
-            await _projectStatRepository.UpdateDiy.SetDto(
-            new
+            foreach (var item in list)
             {
-                IsSettle = 1,
-                SettleTime = DateTime.Now
-            })
-            .Where(m => m.ProjectId == ProjectId && m.EffectDateNum == EffecDate && m.IsSettle == 0)
-            .DisableGlobalFilter(FilterNames.Tenant).ExecuteAffrowsAsync();
+                await SettleCommission(item);
+            }
         }
         #region 私有方法
         /// <summary>
@@ -529,6 +528,80 @@ namespace ZhonTai.Admin.Services.ProjectStat
             output.UserCommission = userCommission;
             return output;
         }
+        [Transaction]
+        private async Task SettleCommission(ProjectStatEntity item)
+        {            
+            //更新状态
+            await _projectStatRepository.UpdateDiy.SetDto(
+            new
+            {
+                IsSettle = 1,
+                SettleTime = DateTime.Now
+            })
+                .Where(m => m.IsSettle == 0 && m.Id == item.Id)
+                .DisableGlobalFilter(FilterNames.Tenant).ExecuteAffrowsAsync();
+            throw (Exception)ResultOutput.NotOk("asdfa");
+            //更新用户佣金 余额，资金明细                                
+            var user = await _platformUserRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.Id == item.UsedUserId).ToOneAsync();
+            if (user != null)
+            {
+                //如果用户是管理员，佣金=团队佣金+用户佣金
+                decimal commission = item.UserCommission.HasValue ? item.UserCommission.Value : 0;
+                if (user.Role == "2")
+                {
+                    commission += item.TenantCommission.HasValue ? item.TenantCommission.Value : 0;
+                }
+                if (commission > 0)
+                {
+                    decimal afterAmount = user.Amount + commission;
+                    await _platformUserRepository.UpdateDiy.Set(m => new PlatformUserEntity
+                    {
+                        Amount = afterAmount
+                    }).Where(m => m.Id == user.Id && m.Amount == user.Amount).DisableGlobalFilter(FilterNames.Tenant).ExecuteAffrowsAsync();
+
+                    await _userBillsRepository.InsertAsync(new UserBillsEntity()
+                    {
+                        BillType = 1,
+                        Commission = commission,
+                        AfterAmount = afterAmount,
+                        EffectDate = item.EffectDate,
+                        PriceId = item.ProjectPriceId,
+                        ProjectId = item.ProjectId,
+                        UserId = user.Id,
+                        TenantId = user.TenantId,
+                        ValidCount = item.ValidCount,
+                        Remark = "",
+                    });
+                }
+                //上级分佣 余额，资金明细
+                if (user.Role != "2")
+                {
+                    var inituser = await _platformUserRepository.Select.DisableGlobalFilter(FilterNames.Tenant).Where(m => m.TenantId == item.TenantId && m.Role == "2").ToOneAsync();
+                    if (inituser != null)
+                    {
+                        decimal afterAmount = inituser.Amount + item.TenantCommission.Value;
+                        await _platformUserRepository.UpdateDiy.Set(m => new PlatformUserEntity
+                        {
+                            Amount = afterAmount
+                        }).Where(m => m.Id == inituser.Id && m.Amount == inituser.Amount).DisableGlobalFilter(FilterNames.Tenant).ExecuteAffrowsAsync();
+
+                        await _userBillsRepository.InsertAsync(new UserBillsEntity()
+                        {
+                            BillType = 2,
+                            Commission = commission,
+                            AfterAmount = afterAmount,
+                            EffectDate = item.EffectDate,
+                            PriceId = item.ProjectPriceId,
+                            ProjectId = item.ProjectId,
+                            UserId = inituser.Id,
+                            TenantId = inituser.TenantId,
+                            ValidCount = item.ValidCount,
+                            Remark = "",
+                        });
+                    }
+                }
+            }
+        }
         #endregion
     }
 }

src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -315,7 +315,8 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
                 Password = user.Password,
                 Role = "2",
                 ParentId = "0_",
-                InviteCode = invite
+                InviteCode = invite,
+                CommissionRatio= _appConfig.TenantRatio
             };
             await _platformUserRepository.InsertAsync(platfromUser);
             long platfromUserId = platfromUser.Id;

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

@@ -430,6 +430,11 @@
             腾讯云短信相关配置
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Configs.AppConfig.TenantRatio">
+            <summary>
+            平台默认抽成比率
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Configs.InviteUrl.Prefix">
             <summary>
             前缀
@@ -1158,6 +1163,16 @@
             短信单发
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Consts.TaskNames">
+            <summary>
+            任务常量
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Core.Consts.TaskNames.CompanyDrawTask">
+            <summary>
+            公司抽成生效时间任务
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Conventions.ApiGroupConvention">
             <summary>
             Api分组约定
@@ -1953,6 +1968,22 @@
             输入模型验证过滤器
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Handlers.AppCustomTaskHandler">
+            <summary>
+            模块自定义任务处理器
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Handlers.TaskHandler">
+            <summary>
+            模块任务处理器
+            </summary>
+        </member>
+        <member name="M:ZhonTai.Admin.Core.Handlers.TaskHandler.ModuleTask(FreeScheduler.TaskInfo)">
+            <summary>
+            公司抽成任务
+            </summary>
+            <param name="task"></param>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Helpers.NOPIHelper">
             <summary>
             Excel帮助类
@@ -2368,11 +2399,16 @@
             文章标题
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Ariticle.AriticleEntity.SkipContent">
+        <member name="P:ZhonTai.Admin.Domain.Ariticle.AriticleEntity.Content">
             <summary>
             文章内容
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Ariticle.AriticleEntity.ContentOnly">
+            <summary>
+            纯文章内容
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.Ariticle.AriticleEntity.Rank">
             <summary>
             排序 数值越大越靠前
@@ -2803,6 +2839,11 @@
             标签
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Notice.NoticeEntity.IsShow">
+            <summary>
+            是否展示 1展示 0不展示
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.OprationLog.OprationLogEntity">
             <summary>
             操作日志
@@ -3195,6 +3236,61 @@
             抽成比例
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.PlatformUserEntity.Amount">
+            <summary>
+            余额
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Domain.Platform.UserBillsEntity">
+            <summary>
+            平台用户资金明细
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.BillType">
+            <summary>
+            类型 1推广佣金 2团队佣金
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.EffectDate">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.UserId">
+            <summary>
+            用户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.ProjectId">
+            <summary>
+            项目Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.PriceId">
+            <summary>
+            结算标准Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.ValidCount">
+            <summary>
+            有效数
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.Commission">
+            <summary>
+            佣金
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.AfterAmount">
+            <summary>
+            变更后金额
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Platform.UserBillsEntity.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.ProjectLink.ProjectLinkEntity">
             <summary>
             推广码
@@ -3520,6 +3616,16 @@
             平台比率
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Project.ProjectStatEntity.UserCommission">
+            <summary>
+            用户佣金
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Domain.Project.ProjectStatEntity.UserRole">
+            <summary>
+            用户角色
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.RoleOrgEntity">
             <summary>
             角色部门
@@ -4938,16 +5044,36 @@
             文章标题
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleAddInput.SkipContent">
+        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleAddInput.Content">
             <summary>
             文章内容
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleAddInput.ContentOnly">
+            <summary>
+            纯文章内容
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleAddInput.Rank">
             <summary>
             排序 数值越大越靠前
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleGetPageDto.Keyword">
+            <summary>
+            关键字 文章标题
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleListOutput.Title">
+            <summary>
+            文章标题
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.Article.Dto.AriticleListOutput.Rank">
+            <summary>
+            排序 数值越大越靠前
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Services.Auth.AuthService">
             <summary>
             认证授权服务
@@ -7441,6 +7567,11 @@
             纯文本内容
             </summary>        
         </member>
+        <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeAddInput.IsShow">
+            <summary>
+            是否展示 1展示 0不展示
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Notice.Dto.NoticeListOutput.Title">
             <summary>
             公告标题