diff --git a/src/main/java/com/sipai/service/scada/MPointService.java b/src/main/java/com/sipai/service/scada/MPointService.java index 6cabf4d3..a55ec971 100644 --- a/src/main/java/com/sipai/service/scada/MPointService.java +++ b/src/main/java/com/sipai/service/scada/MPointService.java @@ -1474,7 +1474,7 @@ public class MPointService { if (DateUtil.isCellDateFormatted(cell)) { //用于转化为日期格式 Date d = cell.getDateCellValue(); - SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String cellDate = formater.format(d); return cellDate; } else { @@ -1510,7 +1510,7 @@ public class MPointService { if (DateUtil.isCellDateFormatted(cell)) { //用于转化为日期格式 Date d = cell.getDateCellValue(); - SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String cellDate = formater.format(d); return cellDate; } else {