From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
index b6cf7b5..c828318 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java
@@ -40,6 +40,9 @@
 	@ApiModelProperty(value = "")
 	private String name;
 
+	@ApiModelProperty(value = "璁惧搴忓彿")
+	private Integer deviceNo;
+
 	@ApiModelProperty(value = "琛ㄥ喅鏁�")
 	private Integer voteNum;
 
@@ -106,6 +109,14 @@
 	@TableField(exist = false)
 	private String pairEndNodeId;
 
+	@ApiModelProperty(value = "妗ヨ仈涓婅竟绾縄D")
+	@TableField(exist = false)
+	private String bridgeEdgeTopId;
+
+	@ApiModelProperty(value = "妗ヨ仈涓嬭竟绾縄D")
+	@TableField(exist = false)
+	private String bridgeEdgeBottomId;
+
 	@ApiModelProperty(value = "x")
 	@TableField(exist = false)
 	private Double vnodePositionX;

--
Gitblit v1.9.1