Merge remote-tracking branch 'origin/v2.x' into v2.x
# Conflicts: # web/src/views/system/login/page.vuepull/57/head
commit
f0ec91ed4c
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue