From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html b/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
index 86c2a1a..b12c73c 100644
--- a/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
+++ b/src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html
@@ -31,7 +31,7 @@
 </nz-table>
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">������</button>
-  <button nz-button [nzType]="'primary'" (click)="save($event)" [nzLoading]="isSaving">               
+  <button nz-button [nzType]="'primary'" (click)="save($event,null,null)" [nzLoading]="isSaving">               
          <span >
             ������<span *ngIf="isSaving" >���</span>
          </span>

--
Gitblit v1.8.0