From fd831d5a9024f46328be4f8794ac39b0072189bd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 12:08:55 +0800
Subject: [PATCH 1/9] =?UTF-8?q?Excel=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5Bo?=
 =?UTF-8?q?olean=E5=9E=8B=E6=95=B0=E6=8D=AE?=
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 ++++
 .../java/com/ruoyi/common/utils/reflect/ReflectUtils.java     | 4 ++++
 2 files changed, 8 insertions(+)

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 6d57f22a..d9f4efd7 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
@@ -274,6 +274,10 @@ public class ExcelUtil<T>
                             val = DateUtil.getJavaDate((Double) val);
                         }
                     }
+                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
+                    {
+                        val = Convert.toBool(val, false);
+                    }
                     if (StringUtils.isNotNull(fieldType))
                     {
                         Excel attr = field.getAnnotation(Excel.class);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
index 5241101b..9befe41a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@@ -204,6 +204,10 @@ public class ReflectUtils
                             args[i] = DateUtil.getJavaDate((Double) args[i]);
                         }
                     }
+                    else if (cs[i] == boolean.class || cs[i] == Boolean.class)
+                    {
+                        args[i] = Convert.toBool(args[i]);
+                    }
                 }
             }
             return (E) method.invoke(obj, args);

From a3b86d6f6d8fde802b584369010f6b8dbffc4011 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 12:09:24 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?float=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/constant/GenConstants.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 0c7cfdba..65c2d7c1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -37,7 +37,7 @@ public class GenConstants
 
     /** 数据库数字类型 */
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "float", "double", "decimal" };
+            "bit", "bigint", "float", "double", "decimal" };
 
     /** 页面不需要编辑字段 */
     public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };

From 6072239a40c18afb402b07ff182bb2594728f7a9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 13:57:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=86=85=E5=AD=98=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/monitor/cache/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index c78a2209..6b012df7 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -117,14 +117,14 @@ export default {
         this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
         this.usedmemory.setOption({
           tooltip: {
-            formatter: "{b} <br/>{a} : {c}M",
+            formatter: "{b} <br/>{a} : {c}K",
           },
           series: [
             {
               name: "峰值",
               type: "gauge",
               detail: {
-                formatter: "{value}M",
+                formatter: "{value}K",
               },
               data: [
                 {

From c666faed6691bf51918195484f22354ebcf86b8d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 20:31:45 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B9=8B=E9=97=B4=E5=88=87=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E7=BC=93=E5=AD=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/layout/components/AppMain.vue    | 121 ++++++++++++++++--
 .../src/layout/components/TagsView/index.vue  |   5 +
 ruoyi-ui/src/layout/components/global.js      |   3 +
 3 files changed, 120 insertions(+), 9 deletions(-)
 create mode 100644 ruoyi-ui/src/layout/components/global.js

diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 423437b7..8da57146 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -1,7 +1,8 @@
+<!-- @author ruoyi 20201128 支持三级以上菜单缓存 -->
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <keep-alive :max="20" :exclude="notCacheName">
         <router-view :key="key" />
       </keep-alive>
     </transition>
@@ -9,17 +10,119 @@
 </template>
 
 <script>
+import Global from "@/layout/components/global.js";
+
 export default {
   name: 'AppMain',
   computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+    notCacheName() {
+      var visitedViews = this.$store.state.tagsView.visitedViews;
+      var noCacheViews = [];
+      Object.keys(visitedViews).some((index) => {
+        if (visitedViews[index].meta.noCache) {
+          noCacheViews.push(visitedViews[index].name);
+        }
+      });
+      return noCacheViews;
     },
     key() {
-      return this.$route.path
-    }
-  }
-}
+      return this.$route.path;
+    },
+  },
+  mounted() {
+    // 关闭标签触发
+    Global.$on("removeCache", (name, view) => {
+      this.removeCache(name, view);
+    });
+  },
+  methods: {
+    // 获取有keep-alive子节点的Vnode
+    getVnode() {
+      // 判断子集非空
+      if (this.$children.length == 0) return false;
+      let vnode;
+      for (let item of this.$children) {
+        // 如果data中有key则代表找到了keep-alive下面的子集，这个key就是router-view上的key
+        if (item.$vnode.data.key) {
+          vnode = item.$vnode;
+          break;
+        }
+      }
+      return vnode ? vnode : false;
+    },
+    // 移除keep-alive缓存
+    removeCache(name, view = {}) {
+      let vnode = this.getVnode();
+      if (!vnode) return false;
+      let componentInstance = vnode.parent.componentInstance;
+      // 这个key是用来获取前缀用来后面正则匹配用的
+      let keyStart = vnode.key.split("/")[0];
+      let thisKey = `${keyStart}${view.fullPath}`;
+      let regKey = `${keyStart}${view.path}`;
+
+      this[name]({ componentInstance, thisKey, regKey });
+    },
+    // 移除其他
+    closeOthersTags({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (key != thisKey) {
+          // 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+    // 移除所有缓存
+    closeAllTags({ componentInstance }) {
+      // 销毁实例
+      Object.keys(componentInstance.cache).forEach((key) => {
+        if (componentInstance.cache[key]) {
+          componentInstance.cache[key].componentInstance.$destroy();
+        }
+      });
+      // 删除缓存
+      componentInstance.cache = {};
+      // 移除key中对应的key
+      componentInstance.keys = [];
+    },
+    // 移除单个缓存
+    closeSelectedTag({ componentInstance, regKey }) {
+      let reg = new RegExp(`^${regKey}`);
+      Object.keys(componentInstance.cache).forEach((key, i) => {
+        if (reg.test(key)) {
+          // 销毁实例
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 删除缓存
+          delete componentInstance.cache[key];
+          // 移除key中对应的key
+          componentInstance.keys.splice(i, 1);
+        }
+      });
+    },
+    // 刷新单个缓存
+    refreshSelectedTag({ componentInstance, thisKey }) {
+      Object.keys(componentInstance.cache).forEach((key, index) => {
+        if (null != thisKey && key.replace("/redirect", "") == thisKey) {
+          // 1 销毁实例(这里存在多个key指向一个缓存的情况可能前面一个已经清除掉了所有要加判断)
+          if (componentInstance.cache[key]) {
+            componentInstance.cache[key].componentInstance.$destroy();
+          }
+          // 2 删除缓存
+          delete componentInstance.cache[key];
+          // 3 移除key中对应的key
+          componentInstance.keys.splice(index, 1);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -31,7 +134,7 @@ export default {
   overflow: hidden;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 
@@ -41,7 +144,7 @@ export default {
     min-height: calc(100vh - 84px);
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 84px;
   }
 }
diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/layout/components/TagsView/index.vue
index dce967cf..23eb8f00 100644
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -29,6 +29,7 @@
 <script>
 import ScrollPane from './ScrollPane'
 import path from 'path'
+import Global from "@/layout/components/global.js";
 
 export default {
   components: { ScrollPane },
@@ -144,6 +145,7 @@ export default {
           })
         })
       })
+      Global.$emit("removeCache", "refreshSelectedTag", this.selectedTag);
     },
     closeSelectedTag(view) {
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
@@ -151,12 +153,14 @@ export default {
           this.toLastView(visitedViews, view)
         }
       })
+      Global.$emit("removeCache", "closeSelectedTag", view);
     },
     closeOthersTags() {
       this.$router.push(this.selectedTag)
       this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })
+      Global.$emit("removeCache", "closeOthersTags", this.selectedTag);
     },
     closeAllTags(view) {
       this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
@@ -165,6 +169,7 @@ export default {
         }
         this.toLastView(visitedViews, view)
       })
+      Global.$emit("removeCache", "closeAllTags");
     },
     toLastView(visitedViews, view) {
       const latestView = visitedViews.slice(-1)[0]
diff --git a/ruoyi-ui/src/layout/components/global.js b/ruoyi-ui/src/layout/components/global.js
new file mode 100644
index 00000000..5d2b5b3e
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/global.js
@@ -0,0 +1,3 @@
+import Vue from 'vue'
+const global = new Vue()
+export default global

From a69cc94f354bcc0b787b0de4fe83b7d0c8e3b742 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Nov 2020 20:39:03 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/constant/UserConstants.java  |  3 +++
 .../system/service/impl/SysMenuServiceImpl.java   | 15 +++++++++++++++
 .../log => components/ParentView}/index.vue       |  6 +++---
 ruoyi-ui/src/router/index.js                      |  1 +
 ruoyi-ui/src/store/modules/permission.js          |  5 ++++-
 sql/{ry_20201123.sql => ry_20201128.sql}          |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)
 rename ruoyi-ui/src/{views/system/log => components/ParentView}/index.vue (93%)
 rename sql/{ry_20201123.sql => ry_20201128.sql} (98%)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 69c2b965..94b23a94 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -54,6 +54,9 @@ public class UserConstants
     /** Layout组件标识 */
     public final static String LAYOUT = "Layout";
 
+    /** ParentView组件标识 */
+    public final static String PARENT_VIEW = "ParentView";
+
     /** 校验返回结果码 */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 8b38ead0..fd9084e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -364,6 +364,10 @@ public class SysMenuServiceImpl implements ISysMenuService
         {
             component = menu.getComponent();
         }
+        else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
+        {
+            component = UserConstants.PARENT_VIEW;
+        }
         return component;
     }
 
@@ -379,6 +383,17 @@ public class SysMenuServiceImpl implements ISysMenuService
                 && menu.getIsFrame().equals(UserConstants.NO_FRAME);
     }
 
+    /**
+     * 是否为parent_view组件
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isParentView(SysMenu menu)
+    {
+        return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+    }
+
     /**
      * 根据父节点的ID获取所有子节点
      * 
diff --git a/ruoyi-ui/src/views/system/log/index.vue b/ruoyi-ui/src/components/ParentView/index.vue
similarity index 93%
rename from ruoyi-ui/src/views/system/log/index.vue
rename to ruoyi-ui/src/components/ParentView/index.vue
index ad6360ce..7bf61489 100644
--- a/ruoyi-ui/src/views/system/log/index.vue
+++ b/ruoyi-ui/src/components/ParentView/index.vue
@@ -1,3 +1,3 @@
-<template >
-  <router-view />
-</template>
+<template >
+  <router-view />
+</template>
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index f2b32036..3f14fd3a 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -5,6 +5,7 @@ Vue.use(Router)
 
 /* Layout */
 import Layout from '@/layout'
+import ParentView from '@/components/ParentView';
 
 /**
  * Note: 路由配置项
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index deed4519..260d8af5 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -1,6 +1,7 @@
 import { constantRoutes } from '@/router'
 import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
+import ParentView from '@/components/ParentView';
 
 const permission = {
   state: {
@@ -33,9 +34,11 @@ const permission = {
 function filterAsyncRouter(asyncRouterMap) {
   return asyncRouterMap.filter(route => {
     if (route.component) {
-      // Layout组件特殊处理
+      // Layout ParentView 组件特殊处理
       if (route.component === 'Layout') {
         route.component = Layout
+      } else if (route.component === 'ParentView') {
+        route.component = ParentView
       } else {
         route.component = loadView(route.component)
       }
diff --git a/sql/ry_20201123.sql b/sql/ry_20201128.sql
similarity index 98%
rename from sql/ry_20201123.sql
rename to sql/ry_20201128.sql
index 9b8ec9cf..1db0d5af 100644
--- a/sql/ry_20201123.sql
+++ b/sql/ry_20201128.sql
@@ -169,7 +169,7 @@ insert into sys_menu values('104',  '岗位管理', '1',   '5', 'post',       's
 insert into sys_menu values('105',  '字典管理', '1',   '6', 'dict',       'system/dict/index',        1, 0, 'C', '0', '0', 'system:dict:list',        'dict',          'admin', sysdate(), '', null, '字典管理菜单');
 insert into sys_menu values('106',  '参数设置', '1',   '7', 'config',     'system/config/index',      1, 0, 'C', '0', '0', 'system:config:list',      'edit',          'admin', sysdate(), '', null, '参数设置菜单');
 insert into sys_menu values('107',  '通知公告', '1',   '8', 'notice',     'system/notice/index',      1, 0, 'C', '0', '0', 'system:notice:list',      'message',       'admin', sysdate(), '', null, '通知公告菜单');
-insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        'system/log/index',         1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
+insert into sys_menu values('108',  '日志管理', '1',   '9', 'log',        '',                         1, 0, 'M', '0', '0', '',                        'log',           'admin', sysdate(), '', null, '日志管理菜单');
 insert into sys_menu values('109',  '在线用户', '2',   '1', 'online',     'monitor/online/index',     1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        'admin', sysdate(), '', null, '在线用户菜单');
 insert into sys_menu values('110',  '定时任务', '2',   '2', 'job',        'monitor/job/index',        1, 0, 'C', '0', '0', 'monitor:job:list',        'job',           'admin', sysdate(), '', null, '定时任务菜单');
 insert into sys_menu values('111',  '数据监控', '2',   '3', 'druid',      'monitor/druid/index',      1, 0, 'C', '0', '0', 'monitor:druid:list',      'druid',         'admin', sysdate(), '', null, '数据监控菜单');

From 01861f0aae73728436ab27b5054602d17a8f2f3d Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: Sun, 29 Nov 2020 16:16:54 +0800
Subject: [PATCH 6/9] update pom.xml.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 853866bc..233dd47c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.17.RELEASE</version>
+                <version>2.1.18.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From 2797c1eb3a9a4111feb22adf38f8ab34002943a9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 30 Nov 2020 10:31:11 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E7=9B=AE=E6=A0=87=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E9=9B=86=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/core/text/CharsetKit.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 8297661a..4fa575ce 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -66,7 +66,7 @@ public class CharsetKit
 
         if (null == destCharset)
         {
-            srcCharset = StandardCharsets.UTF_8;
+            destCharset = StandardCharsets.UTF_8;
         }
 
         if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))

From a1bf5aaf8e919eb46699936849ae388b28ae97aa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 30 Nov 2020 10:37:48 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7element-ui=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=B02.14.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index cf5df5fa..c7faaba6 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -45,7 +45,7 @@
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
     "echarts": "4.2.1",
-    "element-ui": "2.13.2",
+    "element-ui": "2.14.1",
     "file-saver": "2.0.1",
     "js-beautify": "1.10.2",
     "fuse.js": "3.4.4",

From 1147ea5f8aba836dbde5969988fcb7db9c49fb11 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 30 Nov 2020 11:10:27 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=82=AC=E5=81=9C=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 83041409..e1396c0a 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -144,6 +144,7 @@ export default {
 .user-info-head {
   position: relative;
   display: inline-block;
+  height: 120px;
 }
 
 .user-info-head:hover:after {