From 5e8ccda522d4288774cd6a80edd57bb63a914909 Mon Sep 17 00:00:00 2001
From: coolkidhay <coolkidhay@foxmail.com>
Date: Wed, 9 Mar 2022 14:39:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8Cissue=E5=9C=B0=E5=9D=80=EF=BC=9Ahttp?=
 =?UTF-8?q?s://gitee.com/y=5Fproject/RuoYi-Vue/issues/I4X0U7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 0d06c4b8..eb940750 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -316,7 +316,7 @@ public class ExcelUtil<T>
                             String dateFormat = field.getAnnotation(Excel.class).dateFormat();
                             if (StringUtils.isNotEmpty(dateFormat))
                             {
-                                val = parseDateToStr(dateFormat, (Date) val);
+                                val = parseDateToStr(dateFormat, val);
                             }
                             else
                             {
@@ -823,7 +823,7 @@ public class ExcelUtil<T>
                 String dictType = attr.dictType();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    cell.setCellValue(parseDateToStr(dateFormat, (Date) value));
+                    cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
                 {

From 420a43cdd59c7a267d1e0a20b339de7626938819 Mon Sep 17 00:00:00 2001
From: younger007 <1304593345@qq.com>
Date: Mon, 14 Mar 2022 02:52:29 +0000
Subject: [PATCH 2/3] =?UTF-8?q?update=20ruoyi-generator/src/main/java/com/?=
 =?UTF-8?q?ruoyi/generator/controller/GenController.java.=20=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E9=82=A3=E8=BE=B9=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7=EF=BC=8C=E5=AD=98=E5=9C=A8=E8=B7=A8=E5=9F=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/generator/controller/GenController.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 2e9e760a..97ff95c1 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -204,7 +204,6 @@ public class GenController extends BaseController
     private void genCode(HttpServletResponse response, byte[] data) throws IOException
     {
         response.reset();
-        response.addHeader("Access-Control-Allow-Origin", "*");
         response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
         response.addHeader("Content-Length", "" + data.length);

From a0364f07583e820d410713153624712bc0affae7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 15 Mar 2022 14:24:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=82=AC=E5=81=9C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/components/Sidebar/Item.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
index 1a99d63f..37214aa0 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
@@ -21,7 +21,11 @@ export default {
     }
 
     if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
+      if (title.length > 5) {
+        vnodes.push(<span slot='title' title={(title)}>{(title)}</span>)
+      } else {
+        vnodes.push(<span slot='title'>{(title)}</span>)
+      }
     }
     return vnodes
   }