gx

@@ -42,10 +42,7 @@ class DeptUserController extends BaseController
      */
     public function add(DeptUserLogic $deptUserLogic){
         $this->param['project_id'] = $this->user['project_id'];
-<<<<<<< HEAD
-=======
         $deptUserLogic->dept_user_add();
         $this->response('success');
->>>>>>> 8a42c22c01d5a3d48150b079338b5db1a01229cf
     }
 }

@@ -42,8 +42,6 @@ class DeptUserLogic extends BaseLogic
         $list = $userModel->list($param,'id',['id','name','email','mobile','created_at']);
         return $this->success($list);
     }
-<<<<<<< HEAD
-=======
 
     /**
      * @name   :dept_user_add
@@ -54,5 +52,4 @@ class DeptUserLogic extends BaseLogic
     public function dept_user_add(){
 
     }
->>>>>>> 8a42c22c01d5a3d48150b079338b5db1a01229cf
 }