liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-02-02 14:05:40 +08:00
parent 00766183c7
commit 3260643e63
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/model/dao/sku.go
View File

@@ -481,6 +481,7 @@ func GetVendorCategoryMap(db *DaoDB, parentID, level, vendorID int, vendorOrgCod
sql += " AND a.category_id = ?" sql += " AND a.category_id = ?"
sqlParams = append(sqlParams, categoryID) sqlParams = append(sqlParams, categoryID)
} }
sql += " ORDER BY a.level, a.vendor_category_seq"
err = GetRows(db, &vendorMaps, sql, sqlParams) err = GetRows(db, &vendorMaps, sql, sqlParams)
if err != nil { if err != nil {
return nil, err return nil, err

9
business/model/store.go
View File

@@ -766,11 +766,10 @@ func (*StoreAudit) TableIndex() [][]string {
type Brand struct { type Brand struct {
ModelIDCULD ModelIDCULD
Name string `orm:"size(255)" json:"name"` //品牌名 Name string `orm:"size(255)" json:"name"` //品牌名
Logo string `orm:"size(255)" json:"logo"` //品牌logo Logo string `orm:"size(255)" json:"logo"` //品牌logo
BrandType int `json:"brandType"` //品牌类型 BrandType int `json:"brandType"` //品牌类型
IsOpen int `json:"isOpen"` //主要三方配送用，是否配送，默认0表示打开，1表示关 IsOpen int `json:"isOpen"` //主要三方配送用，是否配送，默认0表示打开，1表示关
EbaiSupplierID int `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID
} }
func (*Brand) TableUnique() [][]string { func (*Brand) TableUnique() [][]string {