Merge remote-tracking branch 'origin/v2.x' into v2.x

# Conflicts:
#	web/src/views/system/login/page.vue
pull/57/head
李强 2022-05-14 00:40:55 +08:00
commit f0ec91ed4c
1 changed files with 1 additions and 1 deletions

View File

@ -39,7 +39,7 @@
prefix-icon="el-icon-s-promotion"
show-password
placeholder="密码"
@keyup.enter.native="submit"
@keyup.enter.native='submit'
>
</el-input>
</el-form-item>