Merge remote-tracking branch 'origin/master'

# Conflicts:
#	models/product_book.go
This commit is contained in:
Administrator 2026-06-18 18:10:54 +08:00
commit 0f1f05a655

View File

@ -37,7 +37,6 @@ type ProductBook struct {
SalePrice int64 `json:"sale_price" gorm:"not null;default:0;comment:书价"` SalePrice int64 `json:"sale_price" gorm:"not null;default:0;comment:书价"`
Cost int64 `json:"cost" gorm:"not null;default:0;comment:最低运费"` Cost int64 `json:"cost" gorm:"not null;default:0;comment:最低运费"`
Stock int64 `json:"stock" gorm:"not null;default:0;comment:库存"` Stock int64 `json:"stock" gorm:"not null;default:0;comment:库存"`
LiveImage datatypes.JSON `json:"live_image" gorm:"type:json;not null;comment:实拍图json"` LiveImage datatypes.JSON `json:"live_image" gorm:"type:json;not null;comment:实拍图json"`
IsBatchManaged int8 `json:"is_batch_managed" gorm:"type:tinyint(1);not null;default:0;comment:是否批次管理(0:否,1:是)"` IsBatchManaged int8 `json:"is_batch_managed" gorm:"type:tinyint(1);not null;default:0;comment:是否批次管理(0:否,1:是)"`
IsShelfLifeManaged int8 `json:"is_shelf_life_managed" gorm:"type:tinyint(1);not null;default:0;comment:是否效期管理(0:否,1:是)"` IsShelfLifeManaged int8 `json:"is_shelf_life_managed" gorm:"type:tinyint(1);not null;default:0;comment:是否效期管理(0:否,1:是)"`