无JIRA任务 处理合并后冲突

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

需要删除合并进来的重复的代码

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;