Merge branch 'release/10.0' into release/11.0

* release/10.0:
  REPORT-60748 决策报表-属性-坐标尺寸交互问题

# Conflicts:
#	designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
#	designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
#	designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
#	designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java

designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@@ -376,4 +376,5 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     public boolean isComponent() {
         return true;
     }
+
 }