Merge remote-tracking branch 'origin/div' into div

admin

2019-08-27 e70728524e32162b940ded71617a08aaa30a7faf

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -943,9 +943,7 @@
         try {

            goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

         } catch (TaoKeApiException e1) {

            e1.printStackTrace();

         } catch (TaobaoGoodsDownException e1) {

            e1.printStackTrace();

         }



         if (goodsList != null && goodsList.size() > 0) {