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

doum

7 天以前 308bc8e5c0db7298a127f3478995ddc6167328e9

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java

@@ -21,8 +21,8 @@
     private List<PageRegionInfoResponse> childList;
     @ApiModelProperty(value = "监控点集合")
     private    List<CarmeraListVO> carmeraList;
     @ApiModelProperty(value = "消防传感器集合")
     private    List<CarmeraListVO> deviceList;
     @ApiModelProperty(value = "消防设备集合")
     private    List<CarmeraListVO> deviceList;
     @ApiModelProperty(value = "消防传感器集合")
     private    List<CarmeraListVO> sensorList;
}