From 0e870168d08250746de7a16d6e1a24d803225b57 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sun, 20 Sep 2020 17:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20issues/I1VN0E=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E8=A1=A8=E7=BB=93=E6=9E=84eoa=5Fmailbox=5Finfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/mapper/xml/SysAnnouncementSendMapper.xml  | 5 +----
 .../jeecg/modules/system/model/AnnouncementSendModel.java    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 631c1667..6fda72c6 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -15,7 +15,6 @@
 		<result column="bus_id" property="busId" jdbcType="VARCHAR"/>
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
-		<result column="email_title" property="emailTitle" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<select id="queryByUserId" parameterType="String"  resultType="String">
@@ -38,11 +37,9 @@
 	   		sa.bus_id as bus_id,
 			sa.open_type as open_type,
 			sa.open_page as open_page,
-			sa.msg_abstract,
-		    emi.title as email_title
+			sa.msg_abstract
 	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
-	   left join eoa_mailbox_info emi ON emi.id = sa.bus_id
 	   where sa.send_status = '1'
 	   and sa.del_flag = '0'
 	   and sas.user_id = #{announcementSendModel.userId}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
index 29df6bc1..3c8e9964 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
@@ -76,8 +76,5 @@ public class AnnouncementSendModel implements Serializable {
 	 * 摘要
 	 */
 	private java.lang.String msgAbstract;
-	/**
-	 * 邮箱标题
-	 */
-	private java.lang.String emailTitle;
+
 }