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/store.go
+++ b/business/model/store.go
@@ -398,8 +398,6 @@ 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"`