From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html b/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
index 9b8d9f3..7ff3c0d 100644
--- a/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
+++ b/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
@@ -51,6 +51,6 @@
 	</div>
 	<div class="modal-footer">
 		<button nz-button type="button" (click)="close()">������</button>
-		<button nz-button [nzLoading]="http.loading" [nzType]="'primary'">������</button>
+		<button nz-button  [nzType]="'primary'">������</button>
 	</div>
 </form>

--
Gitblit v1.8.0