Merge remote-tracking branch 'remotes/origin/dev'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffPatrolInitResultDTO.java

@@ -31,4 +31,6 @@ public class StaffPatrolInitResultDTO implements Serializable {
 	 * 最小时间间隔，单位s；默认30，后面可以做成客户可配置参数
 	 */
 	private Integer carmDown;
+
+	private String patrolStartTime;
 }

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

@@ -88,6 +88,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setStatus(entity.getStatus());
 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum());
 		result.setCarmDown(NumConstant.THIRTY);
+		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
 		return result;
 	}