Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java

@@ -277,6 +277,12 @@ public class RoomStatusServiceImpl implements RoomStatusService {
                 changeEndHoldTime(vo,DateUtils.addSeconds(timeHourDate, 59 * 60 + 59));
             }
         }
+        //判断是否整点，是整点，占用开始,结束时间为当前时段0分0秒,
+        if (isToday && timeHourDate.compareTo(DateUtils.parseDate(day + " " + finalNowTime.split(":")[0])) == 0) {
+            vo.setStatus(RoomStatusEnum.HOLD.getValue());
+            changeStartHoldTime(vo, timeHourDate);
+            changeEndHoldTime(vo, DateUtils.parseDate(day + " " + finalNowTime));
+        }
     }
 
     private void checkTimeHourToOrder(RoomStatusVo vo, Date timeHourDate, List<SOrder> orderList, SCleanRecords cleanRecords, Integer orderType, SConsumer user, Long orderId) {