From 89df7add774087ddcf771dcbff341d74044721ac Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期四, 16 十一月 2023 09:58:57 +0800 Subject: [PATCH] 代码合并 --- model/purchase/purchase_products.go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/model/purchase/purchase_products.go b/model/purchase/purchase_products.go index c89a3c3..93a0c0d 100644 --- a/model/purchase/purchase_products.go +++ b/model/purchase/purchase_products.go @@ -9,7 +9,7 @@ type PurchaseProducts struct { global.GVA_MODEL PurchaseId int `json:"purchaseId" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘id - ProductId string `json:"productId" form:"productId" gorm:"type:varchar(255);not null;default '';comment:浜у搧id"` // 浜у搧id + ProductId int `json:"productId" form:"productId" gorm:"type:varchar(255);not null;default '';comment:浜у搧id"` // 浜у搧id Product test.SupplierMaterial `json:"-" gorm:"foreignKey:ProductId"` Amount decimal.Decimal `json:"amount" form:"amount" gorm:"type:decimal(12,2);not null;default 0;comment:閲囪喘鏁伴噺"` // 閲囪喘鏁伴噺 Price decimal.Decimal `json:"price" form:"price" gorm:"type:decimal(12,2);not null;default 0.00;comment:閲囪喘鍗曚环"` // 閲囪喘鍗曚环 -- Gitblit v1.8.0