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

疯狂的狮子li

2021-11-25 af25588b88a727b6c945796e3cf34ed3d4f05e89

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

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