Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

 ruoyi-ui/src/views/monitor/cache/index.vue

@@ -123,6 +123,8 @@
            {

              name: "峰值",

              type: "gauge",

              min: 0,

              max: 1000,

              detail: {

                formatter: this.cache.info.used_memory_human,

              },