Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-05-19 27d6c869e1fac29b6e267f1ccfb1373658bbdffa

 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{