From 893c048112a61150fe0aff9a48daf1bc52d43dbf Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Sun, 23 Feb 2025 20:29:48 +0800
Subject: [PATCH] 2.23

---
 apps/server/src/models/goods/goods.service.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index cbb7b29..f5e6cc7 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-<<<<<<< HEAD
-export class GoodsService {}
-=======
 export class GoodsService {
     
 }
->>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827