From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 10 九月 2019 16:54:11 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java index 783f264..35178bf 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java @@ -42,7 +42,6 @@ import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.vo.brand.BrandInfoVO; import com.yeshi.fanli.vo.goods.GoodsDetailVO; -import com.yeshi.fanli.vo.goods.ShopInfoVO; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -591,7 +590,7 @@ } BrandInfo brandInfo = new BrandInfo(); - brandInfo.setId(taoBaoShop.getShopId()); + brandInfo.setId(taoBaoShop.getId()); brandInfo.setName(taoBaoShop.getShopName()); brandInfo.setIcon(taoBaoShop.getShopIcon()); list.add(brandInfo); -- Gitblit v1.8.0