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

@@ -28,6 +28,7 @@ class ProjectMenuController extends BaseController
      */
      */
     public function lists(){
     public function lists(){
         $menuModel = new ProjectMenuModel();
         $menuModel = new ProjectMenuModel();
+        $this->map['pid'] = $this->param['pid'];
         $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
         $lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }