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

lyfO_o

2022-05-23 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653

 src/views/login/register.vue

@@ -98,6 +98,7 @@
                password:'',
                idcard:'',
                company:'',
                companyid:'',
                department:'',
                job:''
            },
@@ -171,6 +172,7 @@
        },
        companyChange(val){
            this.registerForm.company = val.company
            this.registerForm.companyid = val.id
            if (val.ismain === 1) {
                this.isMain = true;
            }else{