Commit 885f36bd by yangjian

Merge remote-tracking branch 'origin/master'

parents 5e0ccf92 3fe75e62
...@@ -226,7 +226,7 @@ public class TestAddToQueue extends BaseTestImpl { ...@@ -226,7 +226,7 @@ public class TestAddToQueue extends BaseTestImpl {
groupScheduleTools.editGroupSchedule(scheduleId,startTime,chiefCoachId,1,2,dataUserInfo); groupScheduleTools.editGroupSchedule(scheduleId,startTime,chiefCoachId,1,2,dataUserInfo);
try { try {
Thread.sleep(2000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
......
...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl { ...@@ -97,7 +97,7 @@ public class TestSingleReserveSignIn extends BaseTestImpl {
LocalDateTime currentDateTime = LocalDateTime.now(); LocalDateTime currentDateTime = LocalDateTime.now();
int hour = currentDateTime.getHour(); int hour = currentDateTime.getHour();
int minutes = currentDateTime.getMinute(); int minutes = currentDateTime.getMinute();
int minute = hour*60+minutes+20 ; int minute = hour>13 ? (hour*60+minutes+30) : (hour*60+minutes+370) ;
createGroupSchedule(minute); createGroupSchedule(minute);
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment