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

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);
         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 -> {
         List<PlatElderSleepDiagramWeekContentVO> sleep = StreamUtil.map(dateList, e -> {
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
             PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();