Merge remote-tracking branch 'origin/master'

models/product_book.go

@@ -37,7 +37,6 @@ type ProductBook struct {
 	SalePrice          int64          `json:"sale_price" 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:库存"`
-	SaleID             int64          `json:"sale_id" gorm:"not null;default:0;comment:销售ID"`
 	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:是)"`
 	IsShelfLifeManaged int8           `json:"is_shelf_life_managed" gorm:"type:tinyint(1);not null;default:0;comment:是否效期管理(0:否,1:是)"`