Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangbaojian
2023-06-08 09:42:52 +08:00

View File

@@ -79,7 +79,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
for (EventDetail eventdetail : eventDetailList) { for (EventDetail eventdetail : eventDetailList) {
String timeText = eventdetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")); String timeText = eventdetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
EventDetailVO eventDetailVO = new EventDetailVO(); EventDetailVO eventDetailVO = new EventDetailVO();
eventDetailVO.setId(eventdetail.getLineId()); eventDetailVO.setId(eventdetail.getEventId());
eventDetailVO.setTime(timeText); eventDetailVO.setTime(timeText);
eventDetailVOList.add(eventDetailVO); eventDetailVOList.add(eventDetailVO);
} }