From f583dd99584d785393aae3a3aee7b9db6b94868f Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Thu, 2 Dec 2021 14:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=90=88=E5=B9=B6=E5=90=8E=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bugfix/10.0和feature/x修复了两个不同但
原因一致的bug，分别独立提交，导致
release/10.0自动合并到release/11.0时，
该文件内代码出现重复。

需要删除合并进来的重复的代码
---
 .../design/gui/xpane/CardTagLayoutStylePane.java | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java
index 6f5ff974c..6689f48c5 100644
--- a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java
+++ b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java
@@ -23,22 +23,6 @@ public class CardTagLayoutStylePane extends LayoutStylePane {
 		return super.createNamedIntegralStylePane(isRootLayout, false);
 	}
 
-	private LayoutBorderStyle backupStyleFromPopulating = new LayoutBorderStyle();
-
-	@Override
-	public void populateBean(LayoutBorderStyle style) {
-		this.backupStyleFromPopulating = style;
-		super.populateBean(style);
-	}
-
-	@Override
-	public LayoutBorderStyle updateBean() {
-		LayoutBorderStyle style = super.updateBean();
-		style.setTitle(backupStyleFromPopulating.getTitle());
-		style.setType(backupStyleFromPopulating.getType());
-		return style;
-	}
-
 	@Override
 	public void populateBean(LayoutBorderStyle style) {
 		this.backupStyleFromPopulating = style;