From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index 19cd9fd..57ff08e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -157,7 +157,7 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("cells", rbdJsonArray);
modelRbd.setContent(jsonObject.toString());
- modelRbdDao.updateById(modelRbd);
+// modelRbdDao.updateById(modelRbd);
return result;
}
@@ -274,7 +274,7 @@
double childrenWidth = 0.0;
double childrenHeight = 0.0;
double lineWidth = 120;
- double lineHeight = 80;
+ double lineHeight = 90;
if (!"vnode".equals(root.getNodeType())) {
root.setBlockWidth(root.getObjectWidth() + lineWidth);
root.setBlockHeight(root.getObjectHeight() + lineHeight);
--
Gitblit v1.9.1