From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 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 c635287..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
@@ -27,22 +27,32 @@
 
 	@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;
@@ -50,4 +60,7 @@
 	@ApiModelProperty(value = "瀛愯妭鐐�")
 	@TableField(exist = false)
 	private List<XhProductModel> children = new ArrayList<>();
+
+	@TableField(exist = false)
+	private Long paramId;
 }

--
Gitblit v1.9.1