From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java |    7 +++++--
 1 files changed, 5 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 c4407fe..7ec9ee3 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
@@ -25,8 +25,8 @@
 	@ApiModelProperty(value = "浠诲姟闃舵鍚嶇О")
 	private String phaseName;
 
-	@ApiModelProperty(value = "闃舵鏃堕暱")
-	private Double phaseDuration;
+	@ApiModelProperty(value = "闃舵鏃堕暱姣�")
+	private Double phaseDurationRate;
 
 	@ApiModelProperty(value = "闃舵鏃堕��")
 	private Double phaseSpeed;
@@ -42,4 +42,7 @@
 
 	@TableField(exist = false)
 	private Long productId;
+
+	@TableField(exist = false)
+	private Double operatConditDuration;
 }

--
Gitblit v1.9.1