合并分支 'master-server' 到 'master'

gxseo白帽



查看合并请求 !1328

@@ -36,7 +36,6 @@ class ComController extends BaseController
         }else{
             $this->map = $this->getAdminMenuCondition();
         }
-        $this->map['type'] = 0;
         $lists = $projectMenuModel->list($this->map,'sort');
         $menu = array();
         foreach ($lists as $k => $v){