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

fengxiang

2018-06-19 899b4ddd9790728851834062c57892f600ee4355

 src/app/business/entity/data.ts

@@ -6,6 +6,8 @@
    provinceName?: string;
    cityName?: string;
    areaName?: string;
    townName?: string;
    villageName?: string;
}
// 传感器
export interface Sensor {
@@ -61,6 +63,9 @@
    provinceCode?: any|Column;
    areaNames?: AreaNames|any ;
    organization?: Organization;
    townCode?: any|Column;
    villageCode?: any|Column;

  }

 // 报警配置