Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-22 b6442b4640fd94b812419263b03c9ce5e2371c9a

 ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -29,7 +29,7 @@
    variables() {
      return variables;
    },
   sideTheme() {
    sideTheme() {
      return this.$store.state.settings.sideTheme
    }
  },