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

疯狂的狮子li

2021-08-30 bdfd2f0787b0a39fb65793a7f57c95f5de09edf4

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

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

    // 角色编号

    roleId: {

      type: Number

      type: [Number, String]

    }

  },

  data() {