Merge remote-tracking branch 'origin/master'

jiangping

2024-12-19 be5a79736ca3711f0ff624bad27df2b743d8f6ac

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

@@ -59,8 +59,8 @@
    @ExcelColumn(name="开放开始时间")
    private String startTime;

    @ApiModelProperty(value = "开发结束时间")
    @ExcelColumn(name="开发结束时间")
    @ApiModelProperty(value = "开放结束时间")
    @ExcelColumn(name="开放结束时间")
    private String endTime;

    @ApiModelProperty(value = "状态 0可选 1不可选 ", example = "1")