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

疯狂的狮子li

2021-07-02 d6ca9e548d9c11be3281de1ddae392e276dc2a3d

 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,

              },