Merge pull request #84 in BA/design from ~VITO/design:dev to dev

* commit '301628c23b6d9d5afc157c517c9d743022c138bc': 移包
8 years ago · 88e5306891
4 changed files with 2 additions and 3 deletions
--- a/designer/src/com/fr/design/report/ExcelExportPane.java
+++ b/designer/src/com/fr/design/report/ExcelExportPane.java
@ -4,7 +4,6 @@ package com.fr.design.report;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

-import com.fr.design.fun.AbstractExportPane;
 import com.fr.design.gui.ilable.UILabel;

 import javax.swing.*;
--- a/designer/src/com/fr/design/report/ReportExportAttrPane.java
+++ b/designer/src/com/fr/design/report/ReportExportAttrPane.java
@ -4,7 +4,6 @@ import javax.swing.*;

 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.fun.AbstractExportPane;
 import com.fr.design.fun.ExportAttrTabProvider;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.general.Inter;
--- a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java
+++ b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java
@ -1,5 +1,6 @@
 package com.fr.design.fun;

+import com.fr.design.report.AbstractExportPane;
 import com.fr.stable.fun.Level;

 import javax.swing.*;
--- a/designer_base/src/com/fr/design/report/AbstractExportPane.java
+++ b/designer_base/src/com/fr/design/report/AbstractExportPane.java
@ -1,4 +1,4 @@
-package com.fr.design.fun;
+package com.fr.design.report;

 import com.fr.design.dialog.BasicPane;