gx

-<?php
-
-<<<<<<< HEAD
-namespace App\Http\Controllers\Bside;
-=======
-namespace App\Http\Controllers\Aside;
-
-use App\Http\Controllers\Aside\BaseController;
->>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
-
-class ManagerController extends BaseController
-{
-    /**
-     * @name :管理员列表
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function lists(){
-
-    }
-
-    /**
-     * @name:新增
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function add(){
-
-    }
-
-    /**
-     * @name :编辑管理员
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function edit(){
-
-    }
-
-    public function del(){
-
-    }
-}

-<?php
-
-<<<<<<< HEAD
-namespace App\Http\Controllers\Bside;
-=======
-namespace App\Http\Controllers\Aside;
->>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
-
-
-
-use App\Enums\Common\Code;
-<<<<<<< HEAD
-=======
-use App\Http\Controllers\Aside\BaseController;
->>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
-
-class MenuController extends BaseController
-{
-    public function lists(){
-        //TODO::搜索参数处理
-<<<<<<< HEAD
-        $userLogic = new UserLogic();
-        $lists = $userLogic->lists($this->map,$this->p,$this->row,$this->order,['id','name','mobile']);
-        if(empty($lists)){
-            $this->response('请求失败',Code::USER_ERROR,[]);
-        }
-        $this->result($lists);
-=======
->>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
-    }
-}