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

疯狂的狮子li

2021-11-24 c364836a9d32bb6ec7eab8185da244228a55d24c

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

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