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

2019-12-30 17:32:32 +08:00
parent 0432d97cb1 f1d025eb15
commit e4b2a71ec6
6 changed files with 34 additions and 6 deletions
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -398,6 +398,8 @@ type StoreMap struct {

 	FreightDeductionPack string `orm:"size(32)" json:"freightDeductionPack"` //

+	BoxFee int `orm:"default(0)" json:"boxFee"` // 打包费
+
 	AutoPickup          int8 `orm:"default(1)" json:"autoPickup"`   // 是否自动拣货
 	DeliveryType        int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
 	DeliveryFee         int  `json:"deliveryFee"`