Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-23 cb370be00fe6b23a8e13cbbd75c66bab9fed50c9

 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>