2.23

2025-02-23 20:29:48 +08:00 · 2025-02-23 20:29:48 +08:00 · 893c048112
parent 44f77513f9
commit 893c048112
1 changed files with 0 additions and 4 deletions
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';

@Injectable()
-<<<<<<< HEAD
-export class GoodsService {}
-=======
 export class GoodsService {
    
 }
->>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827