Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -119,8 +119,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setStaffPatrolRecId(entity.getId());
 		result.setStatus(entity.getStatus());
 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum());
-		//最小间隔设置 3*60s
-		result.setCarmDown(NumConstant.THREE * NumConstant.SIXTY);
+		//最小间隔设置 20s
+		result.setCarmDown(NumConstant.TWENTY);
 		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
 		//状态为巡查中时返回所在网格ID和名称
 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {