diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index f5e6cc7..cbb7b29 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -1,6 +1,10 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
+<<<<<<< HEAD
+export class GoodsService {}
+=======
 export class GoodsService {
     
 }
+>>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
diff --git a/apps/server/src/models/message/message.controller.ts b/apps/server/src/models/message/message.controller.ts
index 0738c08..e265c5c 100755
--- a/apps/server/src/models/message/message.controller.ts
+++ b/apps/server/src/models/message/message.controller.ts
@@ -3,7 +3,6 @@ import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { MessageService } from './message.service';
 import { AuthGuard } from '@server/auth/auth.guard';
 import { db, VisitType } from '@nice/common';
-
 @Controller('message')
 export class MessageController {
   constructor(private readonly messageService: MessageService) { }