Merge remote-tracking branch 'origin/master'

jiangping

2024-10-10 d7c484c2f5ff13b000b38cc2d078bfe752d3dad8

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java

@@ -149,7 +149,7 @@
            RoomTime s = list.get(i);
            s.setIsUse(false);
            s.setIsChoose(false);
            String now = format.format(roomTime.getYudingDate())+" "+s.getStartTime()+":00";
            String now = format.format(roomTime.getYudingDate())+" "+s.getEndTime()+":00";
            try {
                Date com=format1.parse(now);
                if(flag){