Browse Source

Pull request #3385: 无jira任务,代码合并冲突

Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0

* commit '5e444fcbca08d258b78b476d216a20777b2860cd':
  无JIRA任务 接口签名重复
feature/10.0
kerry 4 years ago
parent
commit
aafdbe19ef
  1. 2
      designer-form/src/main/java/com/fr/design/designer/beans/LayoutAdapter.java

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

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

Loading…
Cancel
Save