Merge branch 'release/0725' into 'gray'

fix brandId



See merge request !107

@@ -48,7 +48,8 @@ module.exports = class extends global.yoho.BaseModel {
                         shopId: subValue.shop_id,
                         shopId: subValue.shop_id,
                         shopName: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
                         shopName: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
                         isRedShop: subValue.is_red_shop,
                         isRedShop: subValue.is_red_shop,
-                        shopTemplateType: subValue.shop_template_type
+                        shopTemplateType: subValue.shop_template_type,
+                        brandId: subValue.id
                     });
                     });
                 });
                 });