Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-06 ab4b75fe30f9a3cf08e3ced667c3ec8c711ca939

 ruoyi-ui/src/views/system/role/selectUser.vue

@@ -64,7 +64,7 @@
  props: {

    // 角色编号

    roleId: {

      type: Number

      type: [Number, String]

    }

  },

  data() {