chore: reslove conflict

This commit is contained in:
pengYYY 2021-12-13 11:48:02 +08:00
commit 2633b461ed

View File

@ -22,7 +22,7 @@
size="large" size="large"
:type="showPsw ? 'text' : 'password'" :type="showPsw ? 'text' : 'password'"
clearable clearable
placeholder="请输入登录密码" placeholder="请输入登录密码:main_/dev_"
> >
<template #prefix-icon> <template #prefix-icon>
<t-icon name="lock-on" /> <t-icon name="lock-on" />