Merge remote-tracking branch 'origin/master'

k94314517

2024-12-11 ea2f787b6148c3e06d945339e1b0c1a97bc28f58

 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;