From bb82387ea5b8146ae5478cbc9b71050a8b99d89e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 30 Dec 2022 14:01:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E5=AD=97=E6=AE=B5=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/UserAnnouncementList.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 4f4da31a3..78582aaf1 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            ellipsis: true,
-            dataIndex: 'initiator',
-            width: 200
-          },
+          // {
+          //   title: this.$t('Sponsor'),
+          //   align: 'left',
+          //   ellipsis: true,
+          //   dataIndex: 'initiator',
+          //   width: 200
+          // },
           {
             title: this.$t('MessageType'),
             align: 'left',

From bc278eee701e5111d324e91effd669556f9e52c7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 30 Dec 2022 14:02:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8--=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/report/controller/ParamsReportEOController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index 7187296a0..f875ee776 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		if(dictModelList.size() != 0){
 			StringBuilder sb = new StringBuilder();
 			for (DictModel dictModel : dictModelList) {
-				if(CutEnum.CN.getValue().equals(paramsReportEO)){
+				if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){
 					sb.append(dictModel.getText()+",");
 				}else{
 					sb.append(dictModel.getTextEn()+",");