Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/service/MeetingRoomService.java

@@ -210,13 +210,13 @@ public class MeetingRoomService {
                         //当新时间与会议结束时间一致时,在延续半小时,循环结束
                         Time time = Time.valueOf(localTime.format(formatter));
                         if (time.equals(meetingRoom.getEndTime())) {
-                            int m = localTime.getMinute();
+                            /*int m = localTime.getMinute();
                             if (m < 30) {
                                 localTime = localTime.withMinute(30);
                             } else {
                                 localTime = localTime.withMinute(0).plusHours(1);
                             }
-                            hashMap.put((i + 2) + "", localTime.format(formatter));
+                            hashMap.put((i + 2) + "", localTime.format(formatter));*/
                             break;
                         }
                     }
@@ -225,6 +225,7 @@ public class MeetingRoomService {
                     Map<String, String> emptyMap = new HashMap<>();
                     meetingRoomMaps.add(emptyMap);
                 }
+                hashMap.put("0", meetingRoom.getStartTime().toString());
                 meetingRoomMaps.add(hashMap); // 将当前会议的映射添加到列表中
             }
             //将找到的时间重新存入到新的map中