diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index 7c9cf18..cf80925 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -16,7 +16,7 @@ export class GoodsController {
     }
 
     // 示例2：路径参数
-    @Get('detail/:id')<<<<<<< HEAD
+    @Get('detail/:id')
             keyword,
             page,
             limit,