From 41b05c629d5298725292e39bdf2d6f55d8e315ee Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Sat, 27 Apr 2019 13:21:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8Cbui?=
 =?UTF-8?q?ld=20failed,=20=E9=94=99=E8=AF=AF=E7=9A=84import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java
index fb840d95c..c724f39a5 100644
--- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java
+++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java
@@ -4,7 +4,8 @@ import com.fr.design.RestartHelper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.onlineupdate.domain.UpdateConstants;
+import com.fr.design.update.domain.UpdateConstants;
+import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ProductConstants;

From c8320d237cac7371282c84d137b5da7593fad7f6 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Sat, 27 Apr 2019 13:26:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/dialog/RestoreResultDialog.java                         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename designer-base/src/main/java/com/fr/design/{onlineupdate => update}/ui/dialog/RestoreResultDialog.java (98%)

diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
similarity index 98%
rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java
rename to designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
index c724f39a5..df1626193 100644
--- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java
@@ -1,11 +1,10 @@
-package com.fr.design.onlineupdate.ui.dialog;
+package com.fr.design.update.ui.dialog;
 
 import com.fr.design.RestartHelper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.update.domain.UpdateConstants;
-import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ProductConstants;

From 05daa121949de9a275a4758b9078a0691a3f24fb Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Sat, 27 Apr 2019 13:28:01 +0800
Subject: [PATCH 3/3] import

---
 .../src/main/java/com/fr/start/module/PreStartActivator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
index 3c255c936..72d3217be 100644
--- a/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java
@@ -3,7 +3,7 @@ package com.fr.start.module;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
 import com.fr.design.fun.OemProcessor;
-import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.design.mainframe.template.info.TemplateInfoCollector;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.DesignerPort;
 import com.fr.general.CloudCenter;