From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/passport/login/login.component.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/passport/login/login.component.html b/src/app/routes/passport/login/login.component.html
index a0e1b2f..5abc040 100644
--- a/src/app/routes/passport/login/login.component.html
+++ b/src/app/routes/passport/login/login.component.html
@@ -2,7 +2,7 @@
     <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg"></nz-alert>
     <div nz-form-item>
         <div nz-form-control [nzValidateStatus]="userName">
-            <nz-input formControlName="userName" [nzPlaceHolder]="'admin'" [nzSize]="'large'">
+            <nz-input formControlName="userName" [nzSize]="'large'">
                 <ng-template #prefix>
                     <i class="anticon anticon-user"></i>
                 </ng-template>
@@ -15,7 +15,7 @@
     </div>
     <div nz-form-item>
         <div nz-form-control [nzValidateStatus]="password">
-            <nz-input formControlName="password" [nzPlaceHolder]="'888888'" [nzType]="'password'" [nzSize]="'large'">
+            <nz-input formControlName="password" [nzType]="'password'" [nzSize]="'large'">
                 <ng-template #prefix>
                     <i class="anticon anticon-lock"></i>
                 </ng-template>

--
Gitblit v1.8.0