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

@@ -90,7 +90,6 @@ class ATemplateModuleController extends BaseController
     public function getProjectList(Project $project){
     public function getProjectList(Project $project){
         $this->map['type'] = ['!=',0];
         $this->map['type'] = ['!=',0];
         $this->map['delete_status'] = 0;
         $this->map['delete_status'] = 0;
-        $this->map['status'] = 0;
         $this->map['title'] = ['like','%'.$this->map['title'].'%'];
         $this->map['title'] = ['like','%'.$this->map['title'].'%'];
         $list = $project->list($this->map,'id',['id','title']);
         $list = $project->list($this->map,'id',['id','title']);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);