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

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

 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,

              },