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/TaskPhase.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
index 8524d50..33523e2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
@@ -28,8 +28,11 @@
 	@ApiModelProperty(value = "闃舵鏃堕暱姣�")
 	private Double phaseDurationRate;
 
+/*
 	@ApiModelProperty(value = "闃舵鏃堕��")
 	private Double phaseSpeed;
+
+ */
 
 	@ApiModelProperty(value = "闃舵椤哄簭")
 	private Integer phaseSort;
@@ -37,9 +40,14 @@
 	@ApiModelProperty(value = "澶囨敞")
 	private String remark;
 
-	@ApiModelProperty(value = "")
-	private Integer status;
 
 	@TableField(exist = false)
 	private Long productId;
+
+	@TableField(exist = false)
+	private Double operatConditDuration;
+
+	@ApiModelProperty(value = "闃舵鏃堕暱")
+	@TableField(exist = false)
+	private Double phaseDuration;
 }

--
Gitblit v1.9.1