From 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期四, 07 十一月 2024 17:15:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java index 055353a..3ad04ee 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java @@ -45,6 +45,9 @@ @ApiModelProperty(value = "闃舵鏃堕暱") private Double phaseDuration; + @ApiModelProperty(value = "闃舵绾︽潫锛堜笉鍙淮淇澶囩被鍨嬪垪琛紝鐢ㄩ�楀彿闅斿紑锛�") + private String phaseConstraint; + @ApiModelProperty(value = "宸ュ喌妯″瀷ID") private Long gkId; @@ -57,7 +60,9 @@ @ApiModelProperty(value = "宸ュ喌妯″瀷鏃堕暱") private Double gkDuration; + @ApiModelProperty(value = "宸ュ喌妯″瀷鎺掑簭") + private Integer sort; + @ApiModelProperty(value = "澶囨敞") private String remark; - } -- Gitblit v1.9.1