laohei

2025-02-23 20:42:18 +08:00 · 2025-02-23 20:42:18 +08:00 · 5b8361fb26
parent 57c9e81811
commit 5b8361fb26
1 changed files with 0 additions and 10 deletions
--- a/apps/server/src/models/goods/goods.module.ts
+++ b/apps/server/src/models/goods/goods.module.ts
@ -3,18 +3,8 @@ import { GoodsService } from './goods.service';
 import { GoodsController } from './goods.controller';

@Module({
-<<<<<<< HEAD
-
    providers: [GoodsService],
    controllers:[GoodsController]
-
-
 })

 export class GoodsModule {}
-=======
-  providers: [GoodsService],
-  controllers: [GoodsController],
-})
-export class GoodsModule {}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276