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

fengxiang

2018-07-05 44e258acff991838ad7f10276556b596b6b0b25b

 src/app/routes/devices/basic-info/device-edit/device-edit.component.ts

@@ -115,7 +115,7 @@
     this.subject.destroy();
   }
   save($event, value, valid) {
    $event.preventDefault();
    const _prevent =  !!$event ? $event.preventDefault() : null ;
    if (valid) {
      this.isSaving = true;
      this.data = value;