From b02c7eb73aabc8531b6e52b02fc15489f0441b52 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 28 十月 2024 10:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 780f12d..061828e 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.constant.Bool;
 import com.zt.common.entity.BusiEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,8 +23,6 @@
 public class SimulatAssess extends BusiEntity {
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "涓婄骇ID")
-	private Long pid;
 
 	@ApiModelProperty(value = "浜у搧鑺傜偣ID")
 	private Long productId;
@@ -38,11 +37,17 @@
 	private Integer simulatFrequency;
 
 	@TableField(exist = false)
-	private Long showProductId;
+	private String showProductId;
 
 	@TableField(exist = false)
 	private String dataType;
 
+	@TableField(exist = false)
+	private Double taskDuration;
+
+	@TableField(exist = false)
+	private Boolean repairDiracFlag;
+
 	@ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
 	private String xml;
 

--
Gitblit v1.9.1