From 7351c1260470e9348ed6d33047ce18370d906d54 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 08 十月 2024 17:12:09 +0800
Subject: [PATCH] 修改

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

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/OperatConditModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/OperatConditModel.java
index 9cf3d4e..f06ca16 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/OperatConditModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/OperatConditModel.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.constant.Constant;
 import com.zt.common.entity.BusiEntity;
 import com.zt.common.entity.TreeNode;
+import com.zt.common.entity.TreeNode2;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,7 +24,7 @@
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("operat_condit_model")
-public class OperatConditModel extends BusiEntity implements TreeNode<OperatConditModel> {
+public class OperatConditModel extends BusiEntity implements TreeNode2<OperatConditModel> {
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "宸ュ喌ID")
@@ -34,11 +36,8 @@
 	@ApiModelProperty(value = "妯″瀷ID")
 	private Long modelId;
 
-	@ApiModelProperty(value = "澶囨敞")
-	private String remark;
-
 	@TableField(exist = false)
-	private String product;
+	private String productName;
 
 	@TableField(exist = false)
 	private String modelName;
@@ -50,7 +49,16 @@
 	@TableField(exist = false)
 	private List<OperatConditModel> children = new ArrayList<>();
 
+	@ApiModelProperty(value = "瀵瑰簲妯″瀷鍒楄〃")
+	@TableField(exist = false)
+	private List<ModelRbd> modelList = new ArrayList<>();
+
+	private Integer isDisabled;
+
 	@TableField(exist = false)
 	private Long pid;
 
+	@TableField(exist = false)
+	private Long iid;
+
 }

--
Gitblit v1.9.1