From d9b108553a77d8d76d0ae1ff6521f3d6404da394 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 21 Aug 2023 15:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=82=AE=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A2=84=E5=85=88=E4=BF=AE=E6=94=B9-004?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/DTO/EmailNoticeConfigViewModel.cs  |  6 +--
 .../Document/TrialEmailNoticeConfig.cs        | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
index 998e7e010..a4b6e0622 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
@@ -108,14 +108,12 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string AttachCNPath { get; set; } = string.Empty;
 
-        public string EmailHtmlContentPath { get; set; } = string.Empty;
+        public string EmailHtmlContent { get; set; } = string.Empty;
 
-        public string EmailHtmlContentCNPath { get; set; } = string.Empty;
+        public string EmailHtmlContentCN { get; set; } = string.Empty;
 
         public string AttachName { get; set; }
         public string AttachNameCN { get; set; }
-        public string EmailHtmlName { get; set; }
-        public string EmailHtmlNameCN { get; set; }
 
 
         public List<UserTypeEnum> ToUserTypeList { get; set; }
diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
index 4066d451c..996d92800 100644
--- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
@@ -49,6 +49,48 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
+
+        /// <summary> 业务模块 /// </summary>
+        public int BusinessModuleEnum { get; set; }
+
+        /// <summary> 业务层级 /// </summary>
+        public int BusinessLevelEnum { get; set; }
+
+        /// <summary> 邮件类型 /// </summary>
+        public int EmailTypeEnum { get; set; }
+
+        /// <summary> 邮件加急类型 /// </summary>
+        public int EmailUrgentEnum { get; set; }
+
+        /// <summary> 定时周期 /// </summary>
+        public string EmailCron { get; set; } = string.Empty;
+
+        /// <summary> 邮件主题 /// </summary>
+        public string EmailTopic { get; set; } = string.Empty;
+
+        public string EmailTopicCN { get; set; } = string.Empty;
+
+        /// <summary> 附件 /// </summary>
+        public string AttachPath { get; set; } = string.Empty;
+
+        public string AttachCNPath { get; set; } = string.Empty;
+
+        public string Description { get; set; } = string.Empty;
+
+
+        public string AttachName { get; set; }
+        public string AttachNameCN { get; set; }
+
+
+        public string EmailHtmlContent { get; set; } = string.Empty;
+        public string EmailHtmlContentCN { get; set; } = string.Empty;
+      
+
+
+
+
+
+
         [Required]
 		public string Code { get; set; } = string.Empty;