冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts

@@ -50,7 +50,7 @@
              }
        } );
        this.subject.next( this );
      }else {
      } else {
        this.validate(); 
      }
  }