diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index f0bc95c..2a4dbf0 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -5,7 +5,6 @@ export class GoodsController {
     constructor() {
         console.log('goods controller')
     }
-
     // 示例1：基本查询参数
     @Get('hello')
     getHello(@Query('name') name?: string) {
diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index 3fd16d8..7288689 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -2,9 +2,25 @@ import { Injectable } from '@nestjs/common';
 
 @Injectable()
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+export class GoodsService {}
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> dc75314e36f86056790758574c3426f379c16a87
 export class GoodsService {}
 =======
 export class GoodsService {
     
 }
+<<<<<<< HEAD
+>>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
+>>>>>>> 5a581fdda6e53f086e068357e1ce0cb6994ddbf2
+=======
+export class GoodsService {
+    
+}
+=======
+>>>>>>> dc75314e36f86056790758574c3426f379c16a87
 >>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
diff --git a/packages/common/prisma/schema.prisma b/packages/common/prisma/schema.prisma
index b235b42..e6249fb 100755
--- a/packages/common/prisma/schema.prisma
+++ b/packages/common/prisma/schema.prisma
@@ -330,8 +330,11 @@ model Resource {
 =======
 
 
+<<<<<<< HEAD
+=======
 >>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
 
+>>>>>>> dc75314e36f86056790758574c3426f379c16a87
 //商品表
 model Goods {
     id          String    @id @default(cuid()) // 商品ID