冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 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>