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

疯狂的狮子li

2021-05-31 f3aaa7ea7a0f56ff4a6f9faf057a6595ab3275a7

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

@@ -8,7 +8,7 @@
  name: "Druid",
  data() {
    return {
      src: process.env.VUE_APP_BASE_API + "/druid/index.html",
      src: process.env.VUE_APP_BASE_API + "/druid/login.html",
      height: document.documentElement.clientHeight - 94.5 + "px;",
      loading: true
    };