Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

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

@@ -16,10 +16,10 @@
  styles: []
})
export class DeviceEditComponent implements OnInit {
  private monitorPoints:any [] = [];
  private deviceVersions:any [] = [];
  private operateUsers:any [] = [];
  private isSaving = false;
  public monitorPoints:any [] = [];
  public deviceVersions:any [] = [];
  public operateUsers:any [] = [];
  public isSaving = false;
  constructor(
    private subject: NzModalSubject,
    private formBuilder: FormBuilder,