Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -131,7 +131,7 @@ class ProjectImport extends Command
     }
     }
 
 
     //判断编码格式
     //判断编码格式
-    function get_code_type($file)
+    protected function get_code_type($file)
     {
     {
         $list = array('GBK', 'UTF-8');
         $list = array('GBK', 'UTF-8');
         $str = file_get_contents($file);
         $str = file_get_contents($file);