Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-07-06 a46a7458e10828dc45eb242d1eebfb92ff83f107

 ruoyi-ui/src/views/register.vue

@@ -86,7 +86,8 @@
        password: "",
        confirmPassword: "",
        code: "",
        uuid: ""
        uuid: "",
        user_type: "sys_user"
      },
      registerRules: {
        username: [