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:
Li1304553726 2025-02-23 20:35:51 +08:00
parent 794f574e3d fbca6ea82c
commit 1b00e90ab5
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,25 @@ import { Injectable } from '@nestjs/common';
@Injectable() @Injectable()
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
export class GoodsService {}
=======
<<<<<<< HEAD
=======
>>>>>>> dc75314e36f86056790758574c3426f379c16a87
export class GoodsService {} export class GoodsService {}
======= =======
export class GoodsService { export class GoodsService {
} }
<<<<<<< HEAD
>>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
>>>>>>> 5a581fdda6e53f086e068357e1ce0cb6994ddbf2
=======
export class GoodsService {
}
=======
>>>>>>> dc75314e36f86056790758574c3426f379c16a87
>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 >>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276

3
packages/common/prisma/schema.prisma
View File

@ -330,8 +330,11 @@ model Resource {
======= =======
<<<<<<< HEAD
=======
>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 >>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
>>>>>>> dc75314e36f86056790758574c3426f379c16a87
//商品表 //商品表
model Goods { model Goods {
id String @id @default(cuid()) // 商品ID id String @id @default(cuid()) // 商品ID