From 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 9b1e5b1..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,20 +22,12 @@
public class SimulatAssess extends BusiEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婄骇ID")
- private Long pid;
@ApiModelProperty(value = "浜у搧鑺傜偣ID")
private Long productId;
- @ApiModelProperty(value = "鎬讳綋浠诲姟")
- private String task;
-
- @ApiModelProperty(value = "鏁版嵁绫诲瀷")
- private Integer dataType;
-
- @ApiModelProperty(value = "鏄惁鍙慨")
- private Integer isRepair;
+ @ApiModelProperty(value = "鎬讳綋浠诲姟妯″瀷ID")
+ private Long taskModelId;
@ApiModelProperty(value = "閲囨牱鍛ㄦ湡")
private Integer samplPeriod;
@@ -43,12 +35,17 @@
@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