Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/10.0

# Conflicts:
#	designer-form/src/main/java/com/fr/design/designer/beans/LayoutAdapter.java

designer-form/src/main/java/com/fr/design/designer/beans/LayoutAdapter.java

@@ -54,7 +54,7 @@ public interface LayoutAdapter {
      * @return 是否添加成功，成功返回true，否则false
      */
     boolean addBean(XCreator creator, int x, int y, boolean accept);
-
+    
     /**
      * 返回该布局管理适配器的Painter，为容器提供放置位置的标识。
      */