From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
index cb1ef09..40c49cb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
@@ -22,8 +22,6 @@
public class SimulatAssess extends BusiEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婄骇ID")
- private Long pid;
@ApiModelProperty(value = "浜у搧鑺傜偣ID")
private Long productId;
@@ -31,27 +29,23 @@
@ApiModelProperty(value = "鎬讳綋浠诲姟妯″瀷ID")
private Long taskModelId;
- @ApiModelProperty(value = "浠跨湡ID")
- private Long taskId;
-
- @ApiModelProperty(value = "鏁版嵁绫诲瀷")
- private Integer dataType;
-
- @ApiModelProperty(value = "鏄惁鍙慨")
- private Integer isRepair;
-
@ApiModelProperty(value = "閲囨牱鍛ㄦ湡")
private Integer samplPeriod;
@ApiModelProperty(value = "浠跨湡娆℃暟")
private Integer simulatFrequency;
- @ApiModelProperty(value = "")
- private Integer status;
+ @TableField(exist = false)
+ private Long showProductId;
- private String code;
+ @TableField(exist = false)
+ private String dataType;
- private String errorMsg;
- private String curveData;
+ @TableField(exist = false)
+ private Integer taskDuration;
+ @ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
+ private String xml;
+
+ private String name;
}
--
Gitblit v1.9.1