Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -244,7 +244,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 0) {
                 userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
                     try {
-                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())) {
+                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())+Integer.parseInt(userMockSubscribeVo.getTimeLimit()) * 60000L) {
                             userMockSubscribeVos.add(userMockSubscribeVo);
                         }
                     } catch (ParseException e) {