Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-31 13:31:53 +08:00
parent 0f2058de84 c6760a6bcc
commit 7c0e3a5e5c
15 changed files with 226 additions and 40 deletions
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -45,6 +45,8 @@ type StoreSkuSyncInfo struct {
 	StoreID int `orm:"column(store_id)"`
 	SkuID   int `orm:"column(sku_id)"` // 这个与Sku.ID的区别是SkuID是必然存在的

+	BoxFee int64
+
 	Price     int64
 	UnitPrice int64