From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期五, 08 十二月 2023 11:14:04 +0800 Subject: [PATCH] merge conflicts --- models/scrap.go | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/scrap.go b/models/scrap.go index 5856b29..144743a 100644 --- a/models/scrap.go +++ b/models/scrap.go @@ -15,9 +15,9 @@ Number string `json:"number" gorm:"column:number;type:varchar(255)"` //鍗曞彿 Status int `json:"status" gorm:"type:tinyint;not null;comment:鐘舵��"` //鐘舵�� - ProductId int `json:"productId" gorm:"type:int;not null;comment:浜у搧id"` //浜у搧id - ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О - Quantity decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"` //鏁伴噺 + ProductId int `json:"productId" gorm:"type:int;not null;comment:浜у搧id"` //浜у搧id + ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О + Quantity decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;default:0;comment:鏁伴噺"` //鏁伴噺 FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationId"` //婧愪綅缃� -- Gitblit v1.8.0