From f0a07ef5c374d8fe5519e8ad460ab3d1c85ca776 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 14:52:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
index 7a608f2..bf35220 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
+++ b/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){
--
Gitblit v1.9.3