diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java index 929f017..20b2ebd 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.time.Instant; import java.time.LocalDateTime; /** @@ -30,7 +31,7 @@ public class InspectionSampleDTO implements Serializable { private String batchNum; @ApiModelProperty(value = "取样时间") - private LocalDateTime sampleTime; + private Instant sampleTime; @ApiModelProperty(value = "样本号") private String sampleNumber; diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java index 7f79404..944b906 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java @@ -238,7 +238,8 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl list = new ArrayList<>(); for (Map.Entry entry : json.entrySet()) { String key = entry.getKey().toString();