无jira 解决冲突 错误提交回退

designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java

@@ -120,7 +120,6 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
     }
 
     public void showEditPane() {
-        // record
         this.cardLayout.show(cardPane, EDIT);
     }
 

designer-realize/src/main/java/com/fr/poly/PolyConstants.java

@@ -14,5 +14,5 @@ public class PolyConstants {
 	}
 	
 	// 操作聚合报表添加行（列）的组件的高（宽）度
-	public static final int OPERATION_SIZE = 30;
+	public static final int OPERATION_SIZE = 15;
 }