diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index ea43ad190..51c668223 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -481,6 +481,7 @@ func GetVendorCategoryMap(db *DaoDB, parentID, level, vendorID int, vendorOrgCod sql += " AND a.category_id = ?" sqlParams = append(sqlParams, categoryID) } + sql += " ORDER BY a.level, a.vendor_category_seq" err = GetRows(db, &vendorMaps, sql, sqlParams) if err != nil { return nil, err diff --git a/business/model/store.go b/business/model/store.go index 5c418b5bc..eec49de88 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -766,11 +766,10 @@ func (*StoreAudit) TableIndex() [][]string { type Brand struct { ModelIDCULD - Name string `orm:"size(255)" json:"name"` //品牌名 - Logo string `orm:"size(255)" json:"logo"` //品牌logo - BrandType int `json:"brandType"` //品牌类型 - IsOpen int `json:"isOpen"` //主要三方配送用,是否配送,默认0表示打开,1表示关 - EbaiSupplierID int `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID + Name string `orm:"size(255)" json:"name"` //品牌名 + Logo string `orm:"size(255)" json:"logo"` //品牌logo + BrandType int `json:"brandType"` //品牌类型 + IsOpen int `json:"isOpen"` //主要三方配送用,是否配送,默认0表示打开,1表示关 } func (*Brand) TableUnique() [][]string {