From e48a56c2171f023f1978b0b6aec9befd43e7a9dc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 04 十一月 2024 08:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java | 8 ++++++--
1 files changed, 6 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 0714fdb..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
@@ -20,6 +20,8 @@
private String algorithmType;
private Integer voteNum;
private Long dataId;
+ private Integer deviceNo;
+
private double x;
private double y;
@@ -29,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