From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 e005bea..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;
@@ -36,7 +37,7 @@
 	private Integer simulatFrequency;
 
 	@TableField(exist = false)
-	private Long showProductId;
+	private String showProductId;
 
 	@TableField(exist = false)
 	private String dataType;
@@ -44,6 +45,9 @@
 	@TableField(exist = false)
 	private Double taskDuration;
 
+	@TableField(exist = false)
+	private Boolean repairDiracFlag;
+
 	@ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
 	private String xml;
 

--
Gitblit v1.9.1