From c96a2d3d424dd8ce6b4fe0f310e01e3c8c148aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 14 Apr 2023 17:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js | 13 +++++++++++--
 fe/PC/src/utils/tabsDesTions/index.js |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 3a6f398d6..fdb7a2c19 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3535,7 +3535,7 @@ export const CountAdjustNote = [
 
 // 消息管理
 /**/
-// 消息类型
+// 消息类型 20230414
 export const MessageType = [
   {
     label: "消息类别代码",
@@ -3545,7 +3545,16 @@ export const MessageType = [
     width: "300px"
   },
   { label: "消息类别名称", prop: "messageTypeName" },
-  { label: "备注", prop: 'remark' }
+  { label: "备注", prop: 'remark' },
+  { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true },
+  { label: "创建者ID", prop: "creatorId" },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
+  { label: "上次修改者", prop: "lastModifierId" },
+  { label: "消息使用的邮件模板名称", prop: "emailTemplate" },
+  { label: "消息使用的短信模板名称", prop: "smsTemplate" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "是否发送邮件", prop: "isSendEmail", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发送短信", prop: "isSendSms", type: "filter", filters: "whetherOrNot" },
 ]
 
 // 系统权限管理
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 17b182eee..065f576f7 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -2843,7 +2843,7 @@ export const CountAdjustNote = [
 
 // 消息管理
 /**/
-// 消息类型 1
+// 消息类型 20230414
 export const MessageType = [
   { label: "消息类别代码", prop: "messageTypeCode" },
   { label: "消息类别名称", prop: "messageTypeName" },
@@ -2858,8 +2858,8 @@ export const MessageType = [
   { label: "是否发送Email", prop: 'isSendEmail', type: "filter", filters: "whetherOrNot" },
   { label: "是否发送Sms", prop: 'isSendSms', type: "filter", filters: "whetherOrNot" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]