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/TaskPhaseModel.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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..d1e0d80 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 @@ -3,13 +3,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.zt.common.entity.BusiEntity; -import com.zt.common.entity.TreeNode; -import com.zt.life.modules.mainPart.basicInfo.model.ParamData; +import com.zt.life.modules.mainPart.taskReliability.dto.TaskPhaseConstraintDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.ArrayList; import java.util.List; /** @@ -37,7 +35,7 @@ private String operatConditName; @ApiModelProperty(value = "宸ュ喌杩愯姣�") - private String operatConditDurationRate; + private double operatConditDurationRate; @ApiModelProperty(value = "澶囨敞") private String remark; @@ -48,5 +46,12 @@ @TableField(exist = false) private String isCheck; + @ApiModelProperty(value = "宸ュ喌杩愯鏃堕暱") + @TableField(exist = false) + private double operatConditDuration; + + @ApiModelProperty(value = "闃舵绾︽潫") + @TableField(exist = false) + private List<TaskPhaseConstraintDto> phaseConstraints; } -- Gitblit v1.9.1