From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
index 323c781..29f5673 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
@@ -37,7 +37,7 @@
 	private String operatConditName;
 
 	@ApiModelProperty(value = "宸ュ喌杩愯姣�")
-	private String operatConditDurationRate;
+	private double operatConditDurationRate;
 
 	@ApiModelProperty(value = "澶囨敞")
 	private String remark;
@@ -48,5 +48,9 @@
 	@TableField(exist = false)
 	private String isCheck;
 
+	@ApiModelProperty(value = "宸ュ喌杩愯鏃堕暱")
+	@TableField(exist = false)
+	private double operatConditDuration;
+
 
 }

--
Gitblit v1.9.1