hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-18 04:45:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev

Browse Source 
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
This commit is contained in:
puhui999
2023-04-15 13:38:31 +08:00
parent b26bba9939 de5b1216cd
commit ec58321dd8
37 changed files with 577 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Login/components/LoginForm.vue
View File

@ -21,7 +21,8 @@
v-model="loginData.loginForm.tenantName"
:placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse"
type="text"
type="primary"
link
/>
</el-form-item>
</el-col>