From b270a07828a9627f1a42e254a430c9921fec4e95 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 26 三月 2025 16:14:37 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java index 7d4b804..6b9f3c9 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/dto/SampleInfo.java @@ -12,6 +12,7 @@ import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.Date; import java.util.List; import java.util.Map; @@ -27,6 +28,8 @@ private Integer sampleColumn; + private Date predictTime; + private Timestamp startTime; private Timestamp endTime; @@ -35,6 +38,8 @@ private Integer sampleCycle; + private Boolean isAdjust = false; + // 调整值 private List<StAdjustDeviationDTO> deviation; // 所有测点信息,避免重复查询 -- Gitblit v1.9.3