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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

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

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