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/taskReliability/model/RbdTreeNode.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
index 309745c..87c6ebf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java
@@ -19,6 +19,9 @@
private String nodeType;
private String algorithmType;
private Integer voteNum;
+ private Long dataId;
+ private Integer deviceNo;
+
private double x;
private double y;
@@ -28,14 +31,16 @@
private double descentWidth;
private double descentHeight;
+ // 閫昏緫涓婄殑铏氳妭鐐圭殑瀹藉害鍙婇珮搴︽垨瀹炶妭鐐瑰姞涓婄嚎瀹藉悗鐨勫��
private double blockWidth;
private double blockHeight;
private double blockWidthNum;
private double blockHeightNum;
- private double myWidth;
- private double myHeight;
+ // 瀹炶妭鐐圭殑瀹藉害鍙婇珮搴�
+ private double objectWidth;
+ private double objectHeight;
private List<RbdTreeNode> children = new ArrayList<>();
--
Gitblit v1.9.1