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

liyang

2022-07-12 918708a227ad8e7bfa03dda018ce49e18da7e794

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

@@ -10,7 +10,7 @@
export default {
  props: {
    to: {
      type: String,
      type: [String, Object],
      required: true
    }
  },