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

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) {
@@ -38,8 +37,4 @@ export class GoodsController {
             results: []
         };
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276

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

@@ -1,26 +1,5 @@
 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

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],