From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +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, 6 insertions(+), 1 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 e16bd9f..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
@@ -32,9 +32,10 @@
 	@ApiModelProperty(value = "闃舵鏃堕��")
 	private Double phaseSpeed;
 
+ */
+
 	@ApiModelProperty(value = "闃舵椤哄簭")
 	private Integer phaseSort;
-*/
 
 	@ApiModelProperty(value = "澶囨敞")
 	private String remark;
@@ -45,4 +46,8 @@
 
 	@TableField(exist = false)
 	private Double operatConditDuration;
+
+	@ApiModelProperty(value = "闃舵鏃堕暱")
+	@TableField(exist = false)
+	private Double phaseDuration;
 }

--
Gitblit v1.9.1