From af7bd200a95b9fc6b8b3f3fc603d612221e21fc7 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 08 一月 2025 08:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dto/MmPredictItemDTO.java |   35 +++++------------------------------
 1 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dto/MmPredictItemDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dto/MmPredictItemDTO.java
index ec5f99f..6c5a6d0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dto/MmPredictItemDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dto/MmPredictItemDTO.java
@@ -17,39 +17,11 @@
 public class MmPredictItemDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private String id;
-
-    private String itemno;
-
-    private String itemname;
-
-    private String caltypeid;
-
-    private String itemtypeid;
-
-    private BigDecimal predictlength;
-
-    private BigDecimal granularity;
-
-    private BigDecimal status;
-
-    private BigDecimal isfuse;
-
-    private BigDecimal predictphase;
-
-    private BigDecimal workchecked;
-
-    private BigDecimal unittransfactor;
-
-    private Date createTime;
-
-    private Date updateTime;
-
     private MmPredictItemEntity mmPredictItem;
 
     private DmModuleItemEntity dmModuleItem;
 
-    private MmItemOutputEntity mmItemOutput;
+    private List<MmItemOutputEntity> mmItemOutputList;
 
     private MmPredictModelEntity mmPredictModel;
 
@@ -59,5 +31,8 @@
 
     private List<MmModelParamEntity> mmModelParamList;
 
-    private List<MmItemResultEntity> mmItemResultList;
+    /**
+     * 计算预测项真实数据点
+     */
+    private String pointId;
 }

--
Gitblit v1.9.3