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/TaskPhaseModel.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 05ca44e..cb6afb6 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
@@ -4,6 +4,7 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,34 +21,30 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("task_phase_model")
-public class TaskPhaseModel extends BusiEntity implements TreeNode<TaskPhaseModel> {
+public class TaskPhaseModel extends BusiEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "闃舵ID")
private Long phaseId;
- @ApiModelProperty(value = "浜у搧鑺傜偣ID")
+ @TableField(exist = false)
private Long productId;
- @ApiModelProperty(value = "妯″瀷ID")
- private Long modelId;
+ @ApiModelProperty(value = "宸ュ喌ID")
+ private Long operatConditId;
+
+ @ApiModelProperty(value = "宸ュ喌鍚嶇О")
+ private String operatConditName;
+
+ @ApiModelProperty(value = "宸ュ喌杩愯姣�")
+ private Double operatConditDurationRate;
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "")
- private Integer status;
+ @TableField(exist = false)
+ private List<TaskPhaseModel> dataThreeList;
@TableField(exist = false)
- private String system;
-
- @TableField(exist = false)
- private String modelName;
-
- @ApiModelProperty(value = "瀛愯妭鐐�")
- @TableField(exist = false)
- private List<TaskPhaseModel> children = new ArrayList<>();
-
- @TableField(exist = false)
- private Long pid;
+ private String isCheck;
}
--
Gitblit v1.9.1