liaohui
/
student-manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
linguoqing 2025-02-23 20:34:29 +08:00
parent 399003f7af de6e632ec6
commit a4adeca36a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/server/src/models/goods/goods.module.ts
View File

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

6
apps/server/src/models/goods/goods.service.ts
View File

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