Merge pull request #68 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0

* commit 'ecc7077359ca4d065d87465a2a0c76d067b1a51c':
  fix
  fix

designer-base/src/com/fr/design/gui/itree/filetree/TemplateFileTree.java

@@ -1,9 +1,9 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.Env;
-import com.fr.base.env.EnvContext;
+import com.fr.core.env.EnvContext;
-import com.fr.base.env.proxy.EnvProxy;
+import com.fr.core.env.proxy.EnvProxy;
-import com.fr.base.env.resource.EnvConfigUtils;
+import com.fr.core.env.resource.EnvConfigUtils;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.env.operator.file.TplFileOperator;
 import com.fr.file.filetree.FileNode;

designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -2,7 +2,7 @@ package com.fr.design.remote.action;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
-import com.fr.base.env.proxy.EnvProxy;
+import com.fr.core.env.proxy.EnvProxy;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;

designer-base/src/com/fr/design/remote/ui/UserManagerPane.java

@@ -1,8 +1,8 @@
 package com.fr.design.remote.ui;
 
-import com.fr.base.env.EnvContext;
+import com.fr.core.env.EnvContext;
-import com.fr.base.env.proxy.EnvProxy;
+import com.fr.core.env.proxy.EnvProxy;
-import com.fr.base.env.resource.EnvConfigUtils;
+import com.fr.core.env.resource.EnvConfigUtils;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;