Merge branch 'main' of http://113.45.157.195:3003/insiinc/nice-playground

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

@@ -4,6 +4,6 @@ import { GoodsController } from './goods.controller';
 
 @Module({
   providers: [GoodsService],
-  controllers: [GoodsController]
+  controllers: [GoodsController],
 })
 export class GoodsModule {}

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

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 @Injectable()
 <<<<<<< HEAD
+<<<<<<< HEAD
 export class GoodsService {}
 =======
 <<<<<<< HEAD
@@ -12,3 +13,8 @@ export class GoodsService {
 }
 >>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
 >>>>>>> 5a581fdda6e53f086e068357e1ce0cb6994ddbf2
+=======
+export class GoodsService {
+    
+}
+>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276