From 5cea5dff7f0d73c1b172252936b393fb390ab669 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 09:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
index 0faecf3..9c37bbf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -14,34 +14,45 @@
import java.util.List;
/**
- * xh_product_model
+ * product_model
*
* @author zt generator
* @since 1.0.0 2024-02-29
*/
@Data
@EqualsAndHashCode(callSuper=false)
-@TableName("xh_product_model")
+@TableName("product_model")
public class XhProductModel extends BusiEntity implements TreeNode<XhProductModel> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "涓婄骇ID")
private Long pid;
-
+ @ApiModelProperty(value = "鎬讳綋ID")
+ private Long shipId;
+ @ApiModelProperty(value = "婧怚D")
+ private Long srcId;
@ApiModelProperty(value = "鍚嶇О")
private String name;
@ApiModelProperty(value = "鑺傜偣绫诲瀷")
+ private String productType;
+
+ @TableField(exist = false)
private String nodeType;
- @ApiModelProperty(value = "杩愯鐘舵�佸浘鐗�")
- private String operationalStatus;
+ @ApiModelProperty(value = "杩愯鍥剧墖")
+ private Long operatImg;
- @ApiModelProperty(value = "寰呮満鐘舵�佸浘鐗�")
- private String standbyState;
+ @ApiModelProperty(value = "鍚岀被璁惧鍚�")
+ private String sameSbName;
- @ApiModelProperty(value = "鏁呴殰鐘舵�佸浘鐗�")
- private String faultState;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥剧墖鍚嶇О")
+ private String operatImgName;
+
+ private String equipType;
+
+ private String namePath;
@ApiModelProperty(value = "鎺掑簭")
private Integer sort;
@@ -49,4 +60,7 @@
@ApiModelProperty(value = "瀛愯妭鐐�")
@TableField(exist = false)
private List<XhProductModel> children = new ArrayList<>();
+
+ @TableField(exist = false)
+ private Long paramId;
}
--
Gitblit v1.9.1