From 3260643e63e80b09719c31bb6dbcfaeebe2dee99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Feb 2021 14:05:40 +0800
Subject: [PATCH] aa

---
 business/model/dao/sku.go | 1 +
 business/model/store.go   | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 {