Pull request #6977: 无JIRA任务 处理合并后冲突

Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0

* commit 'f583dd99584d785393aae3a3aee7b9db6b94868f':
  无JIRA任务 处理合并后冲突

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;