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

@@ -79,7 +79,7 @@ class ProjectLogic extends BaseLogic
         try {
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
-                $this->setTypeStatusEdit($this->param);
+                $this->setTypeSevenEdit($this->param);
             }else{
                 //初始化项目
                 $this->createProjectData($this->param);