Merge pull request #853 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0

* commit '05daa121949de9a275a4758b9078a0691a3f24fb':
  import
  移包
  无JIRA任务，build failed, 错误的import

designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java

@@ -1,10 +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.onlineupdate.domain.UpdateConstants;
+import com.fr.design.update.domain.UpdateConstants;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ProductConstants;

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;