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

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

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

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