Merge pull request #818 in BA/design from ~ZACK/design:master to master

* commit '08069fbfe0b9d75a73bc51eb4557246368826851':
  无JIRA任务   解决代码冲突

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@@ -9,8 +9,8 @@ import com.fr.design.designer.properties.BoundsGroupModel;
 import com.fr.design.designer.properties.FRAbsoluteLayoutPropertiesGroupModel;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
+import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.FRLogger;
 
 import java.awt.*;