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

疯狂的狮子li

2021-08-22 0c9a77873628ffa6d100ea775fe6be627b50c894

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

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

    // 角色编号

    roleId: {

      type: String

      type: [Number, String]

    }

  },

  data() {