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

疯狂的狮子li

2021-11-29 bf98ee3c936130bf4df4b2eda1240f61cf380ac3

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

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