2.23

apps/server/src/models/goods/goods.controller.ts

@@ -15,14 +15,5 @@ export class GoodsController {
         };
     }
 
-    // 示例2：路径参数
-    @Get('detail/:id')
-            keyword,
-            page,
-            limit,
-            results: []
-        };
-    }
-
-}
 
+}

apps/server/src/models/goods/goods.service.ts

@@ -1,10 +1,4 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-<<<<<<< HEAD
 export class GoodsService {}
-=======
-export class GoodsService {
-    
-}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276

apps/server/src/trpc/trpc.module.ts

@@ -34,11 +34,7 @@ import { GoodsModule } from '@server/models/goods/goods.module';
     VisitModule,
     WebSocketModule,
     ResourceModule,
-<<<<<<< HEAD
     GoodsModule,
-=======
-    GoodsModule
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
   ],
   controllers: [],
   providers: [TrpcService, TrpcRouter, Logger],