Merge remote-tracking branch 'origin/master'

k94314517

2024-05-10 0df3c99a23b6774c39abf16af51cf20bbfefc8a5

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java

@@ -79,6 +79,7 @@
    @ApiModelProperty(value = "状态 0启用 1禁用", example = "1")
    @ExcelColumn(name="状态 0启用 1禁用")
    private Integer status;

    @ApiModelProperty(value = "心跳推送时间", example = "1")
    @ExcelColumn(name="心跳推送时间")
    private Date heartTime;