Merge remote-tracking branch 'origin/master'

nidapeng

2024-05-06 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e

 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;