Merge remote-tracking branch 'origin/master'

jiangping

2024-09-20 090846f9f3fe6922cca8f52f1c05b7ece9203a17

 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")