From ca82a088eb4415002cc768c8273047b94425a726 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 2 Nov 2022 15:29:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/UserAnnouncementList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 1c0262c0b..eb6183d14 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -66,6 +66,7 @@
       :expandIconAsCell='false'
       :expandIconColumnIndex="5"
       :expandIcon="expandIcon"
+      :expandRowByClick="true"
       :loading="loading"
       @expand="expandChange"
       @change="handleTableChange">

From 94152bb38bbbad6aba183782abfa5f750082e4a1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 2 Nov 2022 15:44:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E9=93=83=E9=93=9B=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/mapper/xml/SysAnnouncementSendMapper.xml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index e8572c2ad..c47d88995 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -92,7 +92,9 @@
 			sa.open_type as open_type,
 			sa.open_page as open_page,
 			sa.msg_abstract,
-			sa.document_id as document_id
+			sa.document_id as document_id,
+			sa.msg_content_cn as msg_content_cn,
+			sa.msg_content_info_cn as msg_content_info_cn
 	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.del_flag = '0'