From 9036579ff8230dd0d799cff5c52126af438d2fea Mon Sep 17 00:00:00 2001
From: jinsir <874871581@qq.com>
Date: Sun, 23 Feb 2025 20:38:12 +0800
Subject: [PATCH]   223

---
 apps/server/src/models/goods/goods.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,