From f770e36d5ec735f53df298445a6940daa20d0bfa Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 18 十一月 2024 11:12:05 +0800
Subject: [PATCH] 修复bug：1）一键排版时不要自动保存； 2）无论设备数量多少，deviceNo统一改成从1开始。

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
index 2f17f4f..04d1228 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
@@ -34,12 +34,18 @@
 	@ApiModelProperty(value = "")
 	private Long productId;
 
+	@ApiModelProperty(value = "鏄惁鑷姩鎺掔増")
+	private Integer autoLayout;
+
 	@TableField(exist = false)
 	@ApiModelProperty(value = "")
 	private Long[] nodeArr;
 
-	@ApiModelProperty(value = "")
+	@ApiModelProperty(value = "鍥剧殑JSON瀛楃涓�")
 	private String content;
+
+	@ApiModelProperty(value = "鑷姩鎺掔増鍚庣殑鍥剧殑JSON瀛楃涓�")
+	private String autoLayoutContent;
 
 	@ApiModelProperty(value = "")
 	private String publishedContent;
@@ -62,4 +68,20 @@
 	@ApiModelProperty(value = "璁块棶鍚庣缃戠珯鍓嶇紑")
 	private String urlPref;
 
+	@ApiModelProperty(value = "x")
+	@TableField(exist = false)
+	private Double positionX;
+
+	@ApiModelProperty(value = "x")
+	@TableField(exist = false)
+	private Double positionY;
+
+	@ApiModelProperty(value = "澶у皬锛氭í鍚戝崟鍏冩牸鏁�")
+	@TableField(exist = false)
+	private Integer cellSizeX;
+
+	@ApiModelProperty(value = "澶у皬锛氱旱鍚戝崟鍏冩牸鏁�")
+	@TableField(exist = false)
+	private Integer cellSizeY;
+
 }

--
Gitblit v1.9.1