Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/RbdTreeNode.java

@@ -18,6 +18,7 @@
    private String pairEndNodeId;
    private String nodeType;
    private String algorithmType;
    private Integer voteNum;

    private double x;
    private double y;