Merge remote-tracking branch 'origin/master'

k94314517

2024-10-12 51e18e190dafdec70dc1f4a3a9ecd76fb2116726

 server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/MeetingPageRequest.java

@@ -31,4 +31,9 @@

    @ApiModelProperty(value = "会议室主键")
    private Integer roomsId;

    @ApiModelProperty(value = "会议状态: 1=未开始；2=进行中；3=已结束 ; 4=即将开始; 5=已撤销")
    private Integer meetingStatus;


}