Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/admin/system/user/form.vue

@@ -5,7 +5,6 @@
 			<el-form :model="dataForm" :rules="dataRules" label-width="90px" ref="dataFormRef" v-loading="loading">
 				<el-row :gutter="20">
 					<el-col :span="12" class="mb20">
-
 						<el-form-item :label="$t('sysuser.username')" prop="username">
 							<el-input :disabled="dataForm.userId !== '' && !auth('user_sysUser_editUsername')"
 								placeholder="请输入用户名" v-model.trim="dataForm.username" />