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

43c81ecb · huangjy · d7e86714 · 01f45382 · 43c81ecb
Commit 43c81ecb authored Sep 26, 2023 by huangjy
Showing with 1 additions and 1 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
@@ -252,7 +252,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek

        List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);

-        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");

        List<PlatElderSleepDiagramWeekContentVO> sleep = StreamUtil.map(dateList, e -> {
            PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();