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

rk

6 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmEventDataVO.java

@@ -26,7 +26,7 @@
    @ApiModelProperty(value = "报警源资源名称")
    private String resourceName;
    @ApiModelProperty(value = "报警状态")
    private String handleStatus;
    private Integer handleStatus;
    @ApiModelProperty(value = "报警类型名称")
    private String alarmTypeName;