update

@@ -2,11 +2,6 @@
 
 
 namespace App\Http\Controllers\Aside;
 namespace App\Http\Controllers\Aside;
 
 
-<<<<<<< HEAD
-class ProjectMenuController
-{
-
-=======
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Validator;
@@ -117,5 +112,4 @@ class ProjectMenuController extends BaseController
         }
         }
         $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
         $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
     }
     }
->>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
 }
 }

@@ -22,9 +22,8 @@ class CategoryController extends BaseController
         if(!empty($this->param['title'])){
         if(!empty($this->param['title'])){
             $map[] = ['title', 'like', "%{$this->param['title']}%"];
             $map[] = ['title', 'like', "%{$this->param['title']}%"];
         }
         }
-        $sort = ['id' => 'desc', 'pid' => "asc"];
 
 
-        $data = $logic->getList($map, $sort);
+        $data = $logic->getList($map);
         return $this->success($data);
         return $this->success($data);
     }
     }